*
- * This annotation configures JDBC-based Batch infrastructure beans, so you must provide a
- * {@link DataSource} and a {@link PlatformTransactionManager} as beans in the application
- * context.
+ * By default,this annotation configures a resouceless batch infrastructure (ie based on a
+ * {@link org.springframework.batch.core.repository.support.ResourcelessJobRepository} and
+ * a
+ * {@link org.springframework.batch.support.transaction.ResourcelessTransactionManager}).
*
* Note that only one of your configuration classes needs to have the
* @EnableBatchProcessing annotation. Once you have an
@@ -82,23 +75,18 @@
*
*
*
a {@link JobRepository} (bean name "jobRepository" of type
- * {@link org.springframework.batch.core.repository.support.SimpleJobRepository})
- *
a {@link JobLauncher} (bean name "jobLauncher" of type
- * {@link TaskExecutorJobLauncher})
a {@link JobRegistry} (bean name "jobRegistry" of type
* {@link org.springframework.batch.core.configuration.support.MapJobRegistry})
- *
a {@link org.springframework.batch.core.explore.JobExplorer} (bean name
- * "jobExplorer" of type
- * {@link org.springframework.batch.core.explore.support.SimpleJobExplorer})
*
a {@link org.springframework.batch.core.launch.JobOperator} (bean name
* "jobOperator" of type
- * {@link org.springframework.batch.core.launch.support.SimpleJobOperator})
- *
a
- * {@link org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton}
- * (bean name "jobRegistrySmartInitializingSingleton" of type
- * {@link org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton})
*
+ * Other configuration types like JDBC-based or MongoDB-based batch infrastructures can be
+ * defined using store specific annotations like {@link EnableJdbcJobRepository} or
+ * {@link EnableMongoJobRepository}.
+ *
* If the configuration is specified as modular=true, the context also
* contains an {@link AutomaticJobRegistrar}. The job registrar is useful for modularizing
* your configuration if there are multiple jobs. It works by creating separate child
@@ -145,8 +133,8 @@
*
*
*
- *
+ *
*
*
*
@@ -156,7 +144,8 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @author Taeik Lim
- *
+ * @see EnableJdbcJobRepository
+ * @see EnableMongoJobRepository
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -172,114 +161,33 @@
* {@link ApplicationContextFactory}.
* @return boolean indicating whether the configuration is going to be modularized
* into multiple application contexts. Defaults to {@code false}.
+ * @deprecated since 6.0 in favor of Spring's context hierarchies and
+ * {@link GroupAwareJob}s. Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
boolean modular() default false;
/**
- * Set the data source to use in the job repository and job explorer.
- * @return the bean name of the data source to use. Default to {@literal dataSource}.
- */
- String dataSourceRef() default "dataSource";
-
- /**
- * Set the type of the data source to use in the job repository. The default type will
- * be introspected from the datasource's metadata.
- * @since 5.1
- * @see DatabaseType
- * @return the type of data source.
- */
- String databaseType() default "";
-
- /**
- * Set the transaction manager to use in the job repository.
- * @return the bean name of the transaction manager to use. Defaults to
- * {@literal transactionManager}
- */
- String transactionManagerRef() default "transactionManager";
-
- /**
- * Set the execution context serializer to use in the job repository and job explorer.
- * @return the bean name of the execution context serializer to use. Default to
- * {@literal executionContextSerializer}.
- */
- String executionContextSerializerRef() default "executionContextSerializer";
-
- /**
- * The charset to use in the job repository and job explorer
- * @return the charset to use. Defaults to {@literal UTF-8}.
- */
- String charset() default "UTF-8";
-
- /**
- * The Batch tables prefix. Defaults to {@literal "BATCH_"}.
- * @return the Batch table prefix
- */
- String tablePrefix() default AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
-
- /**
- * The maximum length of exit messages in the database.
- * @return the maximum length of exit messages in the database
- */
- int maxVarCharLength() default AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
-
- /**
- * The incrementer factory to use in various DAOs.
- * @return the bean name of the incrementer factory to use. Defaults to
- * {@literal incrementerFactory}.
- */
- String incrementerFactoryRef() default "incrementerFactory";
-
- /**
- * The generator that determines a unique key for identifying job instance objects
- * @return the bean name of the job key generator to use. Defaults to
- * {@literal jobKeyGenerator}.
- *
- * @since 5.1
- */
- String jobKeyGeneratorRef() default "jobKeyGenerator";
-
- /**
- * The large object handler to use in job repository and job explorer.
- * @return the bean name of the lob handler to use. Defaults to {@literal lobHandler}.
- * @deprecated Since 5.2 with no replacement. Scheduled for removal in v6
- */
- @Deprecated(since = "5.2.0", forRemoval = true)
- String lobHandlerRef() default "lobHandler";
-
- /**
- * The type of large objects.
- * @return the type of large objects.
- */
- int clobType() default Types.CLOB;
-
- /**
- * Set the isolation level for create parameter value. Defaults to
- * {@literal ISOLATION_SERIALIZABLE}.
- * @return the value of the isolation level for create parameter
- */
- String isolationLevelForCreate() default "ISOLATION_SERIALIZABLE";
-
- /**
- * Set the task executor to use in the job launcher.
+ * Set the task executor to use in the job operator.
* @return the bean name of the task executor to use. Defaults to
* {@literal taskExecutor}
*/
String taskExecutorRef() default "taskExecutor";
/**
- * Set the conversion service to use in the job repository and job explorer. This
- * service is used to convert job parameters from String literal to typed values and
- * vice versa.
- * @return the bean name of the conversion service to use. Defaults to
- * {@literal conversionService}
+ * Set the transaction manager to use in the job operator.
+ * @return the bean name of the transaction manager to use. Defaults to
+ * {@literal transactionManager}
*/
- String conversionServiceRef() default "conversionService";
+ String transactionManagerRef() default "transactionManager";
/**
* Set the {@link JobParametersConverter} to use in the job operator.
* @return the bean name of the job parameters converter to use. Defaults to
* {@literal jobParametersConverter}
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later
*/
+ @Deprecated(since = "6.0", forRemoval = true)
String jobParametersConverterRef() default "jobParametersConverter";
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableJdbcJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableJdbcJobRepository.java
new file mode 100644
index 0000000000..012e317e1b
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableJdbcJobRepository.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.annotation;
+
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.support.DatabaseType;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Isolation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.sql.Types;
+
+import javax.sql.DataSource;
+
+/**
+ * Annotation to enable a JDBC-based infrastructure in a Spring Batch application.
+ *
+ * This annotation should be used on a {@link Configuration @Configuration} class
+ * annotated with {@link EnableBatchProcessing }. It will automatically configure the
+ * necessary beans for a JDBC-based infrastructure, including a job repository.
+ *
+ * The default configuration assumes that a {@link DataSource} bean named "dataSource" and
+ * a {@link PlatformTransactionManager} bean named "transactionManager" are available in
+ * the application context.
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ * @see EnableBatchProcessing
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface EnableJdbcJobRepository {
+
+ /**
+ * Set the type of the data source to use in the job repository. The default type will
+ * be introspected from the datasource's metadata.
+ * @since 5.1
+ * @see DatabaseType
+ * @return the type of data source.
+ */
+ String databaseType() default "";
+
+ /**
+ * Set the value of the {@code validateTransactionState} parameter. Defaults to
+ * {@code true}.
+ * @return true if the transaction state should be validated, false otherwise
+ */
+ boolean validateTransactionState() default true;
+
+ /**
+ * Set the isolation level for create parameter value. Defaults to
+ * {@link Isolation#SERIALIZABLE}.
+ * @return the value of the isolation level for create parameter
+ */
+ Isolation isolationLevelForCreate() default Isolation.SERIALIZABLE;
+
+ /**
+ * The charset to use in the job repository
+ * @return the charset to use. Defaults to {@literal UTF-8}.
+ */
+ String charset() default "UTF-8";
+
+ /**
+ * The Batch tables prefix. Defaults to
+ * {@link AbstractJdbcBatchMetadataDao#DEFAULT_TABLE_PREFIX}.
+ * @return the Batch table prefix
+ */
+ String tablePrefix() default AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
+
+ /**
+ * The maximum length of exit messages in the database. Defaults to
+ * {@link AbstractJdbcBatchMetadataDao#DEFAULT_EXIT_MESSAGE_LENGTH}
+ * @return the maximum length of exit messages in the database
+ */
+ int maxVarCharLength() default AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
+
+ /**
+ * The type of large objects.
+ * @return the type of large objects.
+ */
+ int clobType() default Types.CLOB;
+
+ /**
+ * Set the data source to use in the job repository.
+ * @return the bean name of the data source to use. Default to {@literal dataSource}.
+ */
+ String dataSourceRef() default "dataSource";
+
+ /**
+ * Set the {@link PlatformTransactionManager} to use in the job repository.
+ * @return the bean name of the transaction manager to use. Defaults to
+ * {@literal transactionManager}
+ */
+ String transactionManagerRef() default "transactionManager";
+
+ /**
+ * Set the {@link JdbcOperations} to use in the job repository.
+ * @return the bean name of the {@link JdbcOperations} to use. Defaults to
+ * {@literal jdbcTemplate}.
+ */
+ String jdbcOperationsRef() default "jdbcTemplate";
+
+ /**
+ * The generator that determines a unique key for identifying job instance objects
+ * @return the bean name of the job key generator to use. Defaults to
+ * {@literal jobKeyGenerator}.
+ *
+ * @since 5.1
+ */
+ String jobKeyGeneratorRef() default "jobKeyGenerator";
+
+ /**
+ * Set the execution context serializer to use in the job repository.
+ * @return the bean name of the execution context serializer to use. Default to
+ * {@literal executionContextSerializer}.
+ */
+ String executionContextSerializerRef() default "executionContextSerializer";
+
+ /**
+ * The incrementer factory to use in various DAOs.
+ * @return the bean name of the incrementer factory to use. Defaults to
+ * {@literal incrementerFactory}.
+ */
+ String incrementerFactoryRef() default "incrementerFactory";
+
+ /**
+ * Set the conversion service to use in the job repository. This service is used to
+ * convert job parameters from String literal to typed values and vice versa.
+ * @return the bean name of the conversion service to use. Defaults to
+ * {@literal conversionService}
+ */
+ String conversionServiceRef() default "conversionService";
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableMongoJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableMongoJobRepository.java
new file mode 100644
index 0000000000..f4233eb1aa
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/EnableMongoJobRepository.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.annotation;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.MongoTransactionManager;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.transaction.annotation.Isolation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * * Annotation to enable a MongoDB-based job repository in a Spring Batch application.
+ *
+ * This annotation should be used on a {@link Configuration @Configuration} class
+ * annotated with {@link EnableBatchProcessing}. It will automatically configure the
+ * necessary beans for a MongoDB-based infrastructure, including a job repository.
+ *
+ * The default configuration assumes that a {@link MongoOperations} bean named
+ * "mongoTemplate" and a {@link MongoTransactionManager} bean named "transactionManager"
+ * are available in the application context.
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ * @see EnableBatchProcessing
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface EnableMongoJobRepository {
+
+ String mongoOperationsRef() default "mongoTemplate";
+
+ /**
+ * Set the {@link MongoTransactionManager} to use in the job repository.
+ * @return the bean name of the transaction manager to use. Defaults to
+ * {@literal transactionManager}
+ */
+ String transactionManagerRef() default "transactionManager";
+
+ /**
+ * Set the isolation level for create parameter value. Defaults to
+ * {@link Isolation#SERIALIZABLE}.
+ * @return the value of the isolation level for create parameter
+ */
+ Isolation isolationLevelForCreate() default Isolation.SERIALIZABLE;
+
+ /**
+ * Set the value of the {@code validateTransactionState} parameter. Defaults to
+ * {@code true}.
+ * @return true if the transaction state should be validated, false otherwise
+ */
+ boolean validateTransactionState() default true;
+
+ /**
+ * The generator that determines a unique key for identifying job instance objects
+ * @return the bean name of the job key generator to use. Defaults to
+ * {@literal jobKeyGenerator}.
+ *
+ */
+ String jobKeyGeneratorRef() default "jobKeyGenerator";
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
index 535886f96c..3466e93cd5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -47,7 +47,10 @@
* every time it is requested. It is lazily initialized and cached. Clients should ensure
* that it is closed when it is no longer needed. If a path is not set, the parent is
* always returned.
+ *
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public abstract class AbstractApplicationContextFactory implements ApplicationContextFactory, ApplicationContextAware {
private static final Log logger = LogFactory.getLog(AbstractApplicationContextFactory.class);
@@ -196,13 +199,11 @@ protected void prepareContext(ConfigurableApplicationContext parent, Configurabl
protected void prepareBeanFactory(ConfigurableListableBeanFactory parent,
ConfigurableListableBeanFactory beanFactory) {
if (copyConfiguration && parent != null) {
- List parentPostProcessors = new ArrayList<>();
- List childPostProcessors = new ArrayList<>();
-
- childPostProcessors.addAll(beanFactory instanceof AbstractBeanFactory
- ? ((AbstractBeanFactory) beanFactory).getBeanPostProcessors() : new ArrayList<>());
- parentPostProcessors.addAll(parent instanceof AbstractBeanFactory
- ? ((AbstractBeanFactory) parent).getBeanPostProcessors() : new ArrayList<>());
+ List childPostProcessors = new ArrayList<>(
+ beanFactory instanceof AbstractBeanFactory factory ? factory.getBeanPostProcessors()
+ : new ArrayList<>());
+ List parentPostProcessors = new ArrayList<>(parent instanceof AbstractBeanFactory factory
+ ? factory.getBeanPostProcessors() : new ArrayList<>());
try {
Class applicationContextAwareProcessorClass = ClassUtils.forName(
@@ -237,8 +238,8 @@ protected void prepareBeanFactory(ConfigurableListableBeanFactory parent,
beanFactory.copyConfigurationFrom(parent);
- List beanPostProcessors = beanFactory instanceof AbstractBeanFactory
- ? ((AbstractBeanFactory) beanFactory).getBeanPostProcessors() : new ArrayList<>();
+ List beanPostProcessors = beanFactory instanceof AbstractBeanFactory abstractBeanFactory
+ ? abstractBeanFactory.getBeanPostProcessors() : new ArrayList<>();
beanPostProcessors.clear();
beanPostProcessors.addAll(aggregatedPostProcessors);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextFactory.java
index 7647661970..2ad87be583 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,7 +16,7 @@
package org.springframework.batch.core.configuration.support;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
@@ -25,7 +25,10 @@
* primarily useful when creating a new {@link ApplicationContext} for a {@link Job}.
*
* @author Lucas Ward
+ * @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public interface ApplicationContextFactory {
ConfigurableApplicationContext createApplicationContext();
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java
index a60c6b9615..8167a837dd 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.support;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.JobFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
@@ -26,8 +26,10 @@
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class ApplicationContextJobFactory implements JobFactory {
private final Job job;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrar.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrar.java
index e8496b83d6..76d2345bae 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrar.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrar.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,7 +20,7 @@
import java.util.Arrays;
import java.util.Collection;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.beans.factory.InitializingBean;
@@ -42,7 +42,9 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.1
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class AutomaticJobRegistrar implements Ordered, SmartLifecycle, ApplicationContextAware, InitializingBean {
private final Collection applicationContextFactories = new ArrayList<>();
@@ -79,8 +81,8 @@ public void setApplicationContext(ApplicationContext applicationContext) {
* use
*/
public void addApplicationContextFactory(ApplicationContextFactory applicationContextFactory) {
- if (applicationContextFactory instanceof ApplicationContextAware) {
- ((ApplicationContextAware) applicationContextFactory).setApplicationContext(applicationContext);
+ if (applicationContextFactory instanceof ApplicationContextAware applicationContextAware) {
+ applicationContextAware.setApplicationContext(applicationContext);
}
this.applicationContextFactories.add(applicationContextFactory);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClasspathXmlApplicationContextsFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClasspathXmlApplicationContextsFactoryBean.java
index 316c364527..58bac350c0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClasspathXmlApplicationContextsFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClasspathXmlApplicationContextsFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -35,8 +35,10 @@
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
- *
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
public class ClasspathXmlApplicationContextsFactoryBean
implements FactoryBean, ApplicationContextAware {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java
index 67df9fd41f..d1b6dc9cd6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -15,77 +15,41 @@
*/
package org.springframework.batch.core.configuration.support;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.sql.Types;
-
-import javax.sql.DataSource;
-
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobKeyGenerator;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobKeyGenerator;
import org.springframework.batch.core.configuration.BatchConfigurationException;
import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.converter.DateToStringConverter;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.converter.LocalDateTimeToStringConverter;
-import org.springframework.batch.core.converter.LocalDateToStringConverter;
-import org.springframework.batch.core.converter.LocalTimeToStringConverter;
-import org.springframework.batch.core.converter.StringToDateConverter;
-import org.springframework.batch.core.converter.StringToLocalDateConverter;
-import org.springframework.batch.core.converter.StringToLocalDateTimeConverter;
-import org.springframework.batch.core.converter.StringToLocalTimeConverter;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.launch.support.JobOperatorFactoryBean;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
-import org.springframework.batch.core.repository.ExecutionContextSerializer;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
-import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
-import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
-import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
-import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
-import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
-import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
-import org.springframework.batch.support.DatabaseType;
+import org.springframework.batch.core.repository.support.ResourcelessJobRepository;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.springframework.core.convert.support.ConfigurableConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
-import org.springframework.jdbc.core.JdbcOperations;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.MetaDataAccessException;
-import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
-import org.springframework.jdbc.support.lob.DefaultLobHandler;
-import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Isolation;
/**
- * Base {@link Configuration} class that provides common JDBC-based infrastructure beans
- * for enabling and using Spring Batch.
+ * Base {@link Configuration} class that provides common infrastructure beans for enabling
+ * and using Spring Batch.
*
* This configuration class configures and registers the following beans in the
* application context:
*
*
- *
a {@link JobRepository} named "jobRepository"
- *
a {@link JobExplorer} named "jobExplorer"
- *
a {@link JobLauncher} named "jobLauncher"
- *
a {@link JobRegistry} named "jobRegistry"
- *
a {@link JobOperator} named "JobOperator"
- *
a {@link JobRegistryBeanPostProcessor} named "jobRegistryBeanPostProcessor"
+ *
a {@link ResourcelessJobRepository} named "jobRepository"
+ *
a {@link MapJobRegistry} named "jobRegistry"
+ *
a {@link TaskExecutorJobOperator} named "jobOperator"
*
a {@link org.springframework.batch.core.scope.StepScope} named "stepScope"
*
a {@link org.springframework.batch.core.scope.JobScope} named "jobScope"
*
@@ -124,122 +88,24 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
}
@Bean
- public JobRepository jobRepository() throws BatchConfigurationException {
- JobRepositoryFactoryBean jobRepositoryFactoryBean = new JobRepositoryFactoryBean();
- try {
- jobRepositoryFactoryBean.setDataSource(getDataSource());
- jobRepositoryFactoryBean.setTransactionManager(getTransactionManager());
- jobRepositoryFactoryBean.setDatabaseType(getDatabaseType());
- jobRepositoryFactoryBean.setIncrementerFactory(getIncrementerFactory());
- jobRepositoryFactoryBean.setJobKeyGenerator(getJobKeyGenerator());
- jobRepositoryFactoryBean.setClobType(getClobType());
- jobRepositoryFactoryBean.setTablePrefix(getTablePrefix());
- jobRepositoryFactoryBean.setSerializer(getExecutionContextSerializer());
- jobRepositoryFactoryBean.setConversionService(getConversionService());
- jobRepositoryFactoryBean.setJdbcOperations(getJdbcOperations());
- jobRepositoryFactoryBean.setLobHandler(getLobHandler());
- jobRepositoryFactoryBean.setCharset(getCharset());
- jobRepositoryFactoryBean.setMaxVarCharLength(getMaxVarCharLength());
- jobRepositoryFactoryBean.setIsolationLevelForCreateEnum(getIsolationLevelForCreate());
- jobRepositoryFactoryBean.setValidateTransactionState(getValidateTransactionState());
- jobRepositoryFactoryBean.afterPropertiesSet();
- return jobRepositoryFactoryBean.getObject();
- }
- catch (Exception e) {
- throw new BatchConfigurationException("Unable to configure the default job repository", e);
- }
- }
-
- /**
- * Define a job launcher.
- * @return a job launcher
- * @throws BatchConfigurationException if unable to configure the default job launcher
- * @deprecated Since 5.2. Use {@link #jobLauncher(JobRepository)} instead
- */
- @Deprecated(forRemoval = true)
- public JobLauncher jobLauncher() throws BatchConfigurationException {
- return jobLauncher(jobRepository());
+ public JobRepository jobRepository() {
+ return new ResourcelessJobRepository();
}
- /**
- * Define a job launcher bean.
- * @param jobRepository the job repository
- * @return a job launcher
- * @throws BatchConfigurationException if unable to configure the default job launcher
- * @since 5.2
- */
@Bean
- public JobLauncher jobLauncher(JobRepository jobRepository) throws BatchConfigurationException {
- TaskExecutorJobLauncher taskExecutorJobLauncher = new TaskExecutorJobLauncher();
- taskExecutorJobLauncher.setJobRepository(jobRepository);
- taskExecutorJobLauncher.setTaskExecutor(getTaskExecutor());
- try {
- taskExecutorJobLauncher.afterPropertiesSet();
- return taskExecutorJobLauncher;
- }
- catch (Exception e) {
- throw new BatchConfigurationException("Unable to configure the default job launcher", e);
- }
- }
-
- @Bean
- public JobExplorer jobExplorer() throws BatchConfigurationException {
- JobExplorerFactoryBean jobExplorerFactoryBean = new JobExplorerFactoryBean();
- jobExplorerFactoryBean.setDataSource(getDataSource());
- jobExplorerFactoryBean.setTransactionManager(getTransactionManager());
- jobExplorerFactoryBean.setJdbcOperations(getJdbcOperations());
- jobExplorerFactoryBean.setJobKeyGenerator(getJobKeyGenerator());
- jobExplorerFactoryBean.setCharset(getCharset());
- jobExplorerFactoryBean.setTablePrefix(getTablePrefix());
- jobExplorerFactoryBean.setLobHandler(getLobHandler());
- jobExplorerFactoryBean.setConversionService(getConversionService());
- jobExplorerFactoryBean.setSerializer(getExecutionContextSerializer());
- try {
- jobExplorerFactoryBean.afterPropertiesSet();
- return jobExplorerFactoryBean.getObject();
- }
- catch (Exception e) {
- throw new BatchConfigurationException("Unable to configure the default job explorer", e);
- }
- }
-
- @Bean
- public JobRegistry jobRegistry() throws BatchConfigurationException {
+ public JobRegistry jobRegistry() {
return new MapJobRegistry();
}
- /**
- * Define a job operator.
- * @return a job operator
- * @throws BatchConfigurationException if unable to configure the default job operator
- * @deprecated Since 5.2. Use
- * {@link #jobOperator(JobRepository, JobExplorer, JobRegistry, JobLauncher)} instead
- */
- @Deprecated(forRemoval = true)
- public JobOperator jobOperator() throws BatchConfigurationException {
- return jobOperator(jobRepository(), jobExplorer(), jobRegistry(), jobLauncher());
- }
-
- /**
- * Define a job operator bean.
- * @param jobRepository a job repository
- * @param jobExplorer a job explorer
- * @param jobRegistry a job registry
- * @param jobLauncher a job launcher
- * @return a job operator
- * @throws BatchConfigurationException if unable to configure the default job operator
- * @since 5.2
- */
@Bean
- public JobOperator jobOperator(JobRepository jobRepository, JobExplorer jobExplorer, JobRegistry jobRegistry,
- JobLauncher jobLauncher) throws BatchConfigurationException {
+ public JobOperator jobOperator(JobRepository jobRepository, JobRegistry jobRegistry)
+ throws BatchConfigurationException {
JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
- jobOperatorFactoryBean.setTransactionManager(getTransactionManager());
jobOperatorFactoryBean.setJobRepository(jobRepository);
- jobOperatorFactoryBean.setJobExplorer(jobExplorer);
jobOperatorFactoryBean.setJobRegistry(jobRegistry);
- jobOperatorFactoryBean.setJobLauncher(jobLauncher);
+ jobOperatorFactoryBean.setTransactionManager(getTransactionManager());
jobOperatorFactoryBean.setJobParametersConverter(getJobParametersConverter());
+ jobOperatorFactoryBean.setTaskExecutor(getTaskExecutor());
try {
jobOperatorFactoryBean.afterPropertiesSet();
return jobOperatorFactoryBean.getObject();
@@ -250,92 +116,33 @@ public JobOperator jobOperator(JobRepository jobRepository, JobExplorer jobExplo
}
/**
- * Defines a {@link JobRegistryBeanPostProcessor}.
- * @return a {@link JobRegistryBeanPostProcessor}
- * @throws BatchConfigurationException if unable to register the bean
- * @since 5.1
- * @deprecated Use {@link #jobRegistrySmartInitializingSingleton(JobRegistry)} instead
+ * Return the transaction manager to use for the job operator. Defaults to
+ * {@link ResourcelessTransactionManager}.
+ * @return The transaction manager to use for the job operator
*/
- @Deprecated(forRemoval = true)
- public JobRegistryBeanPostProcessor jobRegistryBeanPostProcessor() throws BatchConfigurationException {
- JobRegistryBeanPostProcessor jobRegistryBeanPostProcessor = new JobRegistryBeanPostProcessor();
- jobRegistryBeanPostProcessor.setJobRegistry(jobRegistry());
- try {
- jobRegistryBeanPostProcessor.afterPropertiesSet();
- return jobRegistryBeanPostProcessor;
- }
- catch (Exception e) {
- throw new BatchConfigurationException("Unable to configure the default job registry BeanPostProcessor", e);
- }
- }
-
- /**
- * Define a {@link JobRegistrySmartInitializingSingleton} bean.
- * @param jobRegistry the job registry to populate
- * @throws BatchConfigurationException if unable to register the bean
- * @return a bean of type {@link JobRegistrySmartInitializingSingleton}
- * @since 5.2
- */
- @Bean
- public JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton(JobRegistry jobRegistry)
- throws BatchConfigurationException {
- JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton = new JobRegistrySmartInitializingSingleton();
- jobRegistrySmartInitializingSingleton.setJobRegistry(jobRegistry);
- try {
- jobRegistrySmartInitializingSingleton.afterPropertiesSet();
- return jobRegistrySmartInitializingSingleton;
- }
- catch (Exception e) {
- throw new BatchConfigurationException(
- "Unable to configure the default job registry SmartInitializingSingleton", e);
- }
+ protected PlatformTransactionManager getTransactionManager() {
+ return new ResourcelessTransactionManager();
}
- /*
- * Getters to customize the configuration of infrastructure beans
- */
-
/**
- * Return the data source to use for Batch meta-data. Defaults to the bean of type
- * {@link DataSource} and named "dataSource" in the application context.
- * @return The data source to use for Batch meta-data
+ * Return the {@link TaskExecutor} to use in the job operator. Defaults to
+ * {@link SyncTaskExecutor}.
+ * @return the {@link TaskExecutor} to use in the job operator.
*/
- protected DataSource getDataSource() {
- String errorMessage = " To use the default configuration, a data source bean named 'dataSource'"
- + " should be defined in the application context but none was found. Override getDataSource()"
- + " to provide the data source to use for Batch meta-data.";
- if (this.applicationContext.getBeansOfType(DataSource.class).isEmpty()) {
- throw new BatchConfigurationException(
- "Unable to find a DataSource bean in the application context." + errorMessage);
- }
- else {
- if (!this.applicationContext.containsBean("dataSource")) {
- throw new BatchConfigurationException(errorMessage);
- }
- }
- return this.applicationContext.getBean("dataSource", DataSource.class);
+ protected TaskExecutor getTaskExecutor() {
+ return new SyncTaskExecutor();
}
/**
- * Return the transaction manager to use for the job repository. Defaults to the bean
- * of type {@link PlatformTransactionManager} and named "transactionManager" in the
- * application context.
- * @return The transaction manager to use for the job repository
+ * Return the {@link JobParametersConverter} to use in the job operator. Defaults to
+ * {@link DefaultJobParametersConverter}
+ * @return the {@link JobParametersConverter} to use in the job operator.
+ * @deprecated since 6.0 with no replacement and scheduled for removal in 6.2 or
+ * later.
*/
- protected PlatformTransactionManager getTransactionManager() {
- String errorMessage = " To use the default configuration, a transaction manager bean named 'transactionManager'"
- + " should be defined in the application context but none was found. Override getTransactionManager()"
- + " to provide the transaction manager to use for the job repository.";
- if (this.applicationContext.getBeansOfType(PlatformTransactionManager.class).isEmpty()) {
- throw new BatchConfigurationException(
- "Unable to find a PlatformTransactionManager bean in the application context." + errorMessage);
- }
- else {
- if (!this.applicationContext.containsBean("transactionManager")) {
- throw new BatchConfigurationException(errorMessage);
- }
- }
- return this.applicationContext.getBean("transactionManager", PlatformTransactionManager.class);
+ @Deprecated(since = "6.0", forRemoval = true)
+ protected JobParametersConverter getJobParametersConverter() {
+ return new DefaultJobParametersConverter();
}
/**
@@ -356,87 +163,6 @@ protected Isolation getIsolationLevelForCreate() {
return Isolation.SERIALIZABLE;
}
- /**
- * Return the length of long string columns in database. Do not override this if you
- * haven't modified the schema. Note this value will be used for the exit message in
- * both {@link JdbcJobExecutionDao} and {@link JdbcStepExecutionDao} and also the
- * short version of the execution context in {@link JdbcExecutionContextDao} . For
- * databases with multi-byte character sets this number can be smaller (by up to a
- * factor of 2 for 2-byte characters) than the declaration of the column length in the
- * DDL for the tables. Defaults to
- * {@link AbstractJdbcBatchMetadataDao#DEFAULT_EXIT_MESSAGE_LENGTH}
- */
- protected int getMaxVarCharLength() {
- return AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
- }
-
- /**
- * Return the prefix of Batch meta-data tables. Defaults to
- * {@link AbstractJdbcBatchMetadataDao#DEFAULT_TABLE_PREFIX}.
- * @return the prefix of meta-data tables
- */
- protected String getTablePrefix() {
- return AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
- }
-
- /**
- * Return the {@link Charset} to use when serializing/deserializing the execution
- * context. Defaults to "UTF-8".
- * @return the charset to use when serializing/deserializing the execution context
- */
- protected Charset getCharset() {
- return StandardCharsets.UTF_8;
- }
-
- /**
- * A special handler for large objects. The default is usually fine, except for some
- * (usually older) versions of Oracle.
- * @return the {@link LobHandler} to use
- * @deprecated Since 5.2 with no replacement. Scheduled for removal in v6
- */
- @Deprecated(since = "5.2.0", forRemoval = true)
- protected LobHandler getLobHandler() {
- return new DefaultLobHandler();
- }
-
- /**
- * Return the {@link JdbcOperations}. If this property is not overridden, a new
- * {@link JdbcTemplate} will be created for the configured data source by default.
- * @return the {@link JdbcOperations} to use
- */
- protected JdbcOperations getJdbcOperations() {
- return new JdbcTemplate(getDataSource());
- }
-
- /**
- * A custom implementation of the {@link ExecutionContextSerializer}. The default, if
- * not injected, is the {@link DefaultExecutionContextSerializer}.
- * @return the serializer to use to serialize/deserialize the execution context
- */
- protected ExecutionContextSerializer getExecutionContextSerializer() {
- return new DefaultExecutionContextSerializer();
- }
-
- /**
- * Return the value from {@link java.sql.Types} class to indicate the type to use for
- * a CLOB
- * @return the value from {@link java.sql.Types} class to indicate the type to use for
- * a CLOB
- */
- protected int getClobType() {
- return Types.CLOB;
- }
-
- /**
- * Return the factory for creating {@link DataFieldMaxValueIncrementer}
- * implementations used to increment entity IDs in meta-data tables.
- * @return the factory for creating {@link DataFieldMaxValueIncrementer}
- * implementations.
- */
- protected DataFieldMaxValueIncrementerFactory getIncrementerFactory() {
- return new DefaultDataFieldMaxValueIncrementerFactory(getDataSource());
- }
-
/**
* A custom implementation of the {@link JobKeyGenerator}. The default, if not
* injected, is the {@link DefaultJobKeyGenerator}.
@@ -448,53 +174,4 @@ protected JobKeyGenerator getJobKeyGenerator() {
return new DefaultJobKeyGenerator();
}
- /**
- * Return the database type. The default will be introspected from the JDBC meta-data
- * of the data source.
- * @return the database type
- * @throws MetaDataAccessException if an error occurs when trying to get the database
- * type of JDBC meta-data
- *
- */
- protected String getDatabaseType() throws MetaDataAccessException {
- return DatabaseType.fromMetaData(getDataSource()).name();
- }
-
- /**
- * Return the {@link TaskExecutor} to use in the job launcher. Defaults to
- * {@link SyncTaskExecutor}.
- * @return the {@link TaskExecutor} to use in the job launcher.
- */
- protected TaskExecutor getTaskExecutor() {
- return new SyncTaskExecutor();
- }
-
- /**
- * Return the {@link JobParametersConverter} to use in the job operator. Defaults to
- * {@link DefaultJobParametersConverter}
- * @return the {@link JobParametersConverter} to use in the job operator.
- */
- protected JobParametersConverter getJobParametersConverter() {
- return new DefaultJobParametersConverter();
- }
-
- /**
- * Return the conversion service to use in the job repository and job explorer. This
- * service is used to convert job parameters from String literal to typed values and
- * vice versa.
- * @return the {@link ConfigurableConversionService} to use.
- */
- protected ConfigurableConversionService getConversionService() {
- DefaultConversionService conversionService = new DefaultConversionService();
- conversionService.addConverter(new DateToStringConverter());
- conversionService.addConverter(new StringToDateConverter());
- conversionService.addConverter(new LocalDateToStringConverter());
- conversionService.addConverter(new StringToLocalDateConverter());
- conversionService.addConverter(new LocalTimeToStringConverter());
- conversionService.addConverter(new StringToLocalTimeConverter());
- conversionService.addConverter(new LocalDateTimeToStringConverter());
- conversionService.addConverter(new StringToLocalDateTimeConverter());
- return conversionService;
- }
-
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java
index 4dde8ea152..aa14354826 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,10 +24,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.configuration.JobFactory;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.configuration.StepRegistry;
import org.springframework.batch.core.launch.NoSuchJobException;
@@ -47,7 +46,9 @@
* @author Dave Syer
* @author Stephane Nicoll
* @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class DefaultJobLoader implements JobLoader, InitializingBean {
private static final Log logger = LogFactory.getLog(DefaultJobLoader.class);
@@ -173,7 +174,7 @@ private Collection doLoad(ApplicationContextFactory factory, boolean unregi
if (!autoRegistrationDetected) {
- Job job = (Job) context.getBean(name);
+ Job job = context.getBean(name, Job.class);
String jobName = job.getName();
// On reload try to unregister first
@@ -251,15 +252,14 @@ private Collection getSteps(final StepLocator stepLocator, final Applicati
* @throws DuplicateJobException if that job is already registered
*/
private void doRegister(ConfigurableApplicationContext context, Job job) throws DuplicateJobException {
- final JobFactory jobFactory = new ReferenceJobFactory(job);
- jobRegistry.register(jobFactory);
+ jobRegistry.register(job);
if (stepRegistry != null) {
- if (!(job instanceof StepLocator)) {
+ if (!(job instanceof StepLocator stepLocator)) {
throw new UnsupportedOperationException("Cannot locate steps from a Job that is not a StepLocator: job="
+ job.getName() + " does not implement StepLocator");
}
- stepRegistry.register(job.getName(), getSteps((StepLocator) job, context));
+ stepRegistry.register(job.getName(), getSteps(stepLocator, context));
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java
index a9074f6671..0e69248c72 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -39,7 +39,10 @@
* the child {@link ApplicationContext} is returned. The child context is not re-created
* every time it is requested. It is lazily initialized and cached. Clients should ensure
* that it is closed when it is no longer needed.
+ *
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class GenericApplicationContextFactory extends AbstractApplicationContextFactory {
/**
@@ -126,7 +129,7 @@ protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) {
GenericApplicationContextFactory.this.prepareBeanFactory(parentBeanFactory, beanFactory);
for (Class cls : getBeanFactoryPostProcessorClasses()) {
for (String name : parent.getBeanNamesForType(cls)) {
- beanFactory.registerSingleton(name, (parent.getBean(name)));
+ beanFactory.registerSingleton(name, parent.getBean(name));
}
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java
index 2ea527202c..b0cbce6657 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java
@@ -15,10 +15,10 @@
*/
package org.springframework.batch.core.configuration.support;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
@@ -74,7 +74,7 @@ public void execute(JobExecution execution) {
/**
* Concatenates the group name and the delegate job name (joining with a ".").
*
- * @see org.springframework.batch.core.Job#getName()
+ * @see Job#getName()
*/
@Override
public String getName() {
@@ -99,8 +99,8 @@ public JobParametersValidator getJobParametersValidator() {
@Override
public boolean equals(Object obj) {
- if (obj instanceof GroupAwareJob) {
- return ((GroupAwareJob) obj).delegate.equals(delegate);
+ if (obj instanceof GroupAwareJob groupAwareJob) {
+ return groupAwareJob.delegate.equals(delegate);
}
return false;
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JdbcDefaultBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JdbcDefaultBatchConfiguration.java
new file mode 100644
index 0000000000..172cb98809
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JdbcDefaultBatchConfiguration.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.support;
+
+import org.springframework.batch.core.configuration.BatchConfigurationException;
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.converter.DateToStringConverter;
+import org.springframework.batch.core.converter.LocalDateTimeToStringConverter;
+import org.springframework.batch.core.converter.LocalDateToStringConverter;
+import org.springframework.batch.core.converter.LocalTimeToStringConverter;
+import org.springframework.batch.core.converter.StringToDateConverter;
+import org.springframework.batch.core.converter.StringToLocalDateConverter;
+import org.springframework.batch.core.converter.StringToLocalDateTimeConverter;
+import org.springframework.batch.core.converter.StringToLocalTimeConverter;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.ExecutionContextSerializer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
+import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
+import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
+import org.springframework.batch.support.DatabaseType;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.support.ConfigurableConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.MetaDataAccessException;
+import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.sql.Types;
+
+/**
+ * Base {@link Configuration} class that provides common JDBC-based infrastructure beans
+ * for enabling and using Spring Batch.
+ *
+ * This configuration class configures and registers the following beans in the
+ * application context:
+ *
+ *
+ *
a {@link JobRepository} named "jobRepository"
+ *
a {@link JobRegistry} named "jobRegistry"
+ *
a {@link JobOperator} named "jobOperator"
+ *
a {@link org.springframework.batch.core.scope.StepScope} named "stepScope"
+ *
a {@link org.springframework.batch.core.scope.JobScope} named "jobScope"
+ *
+ *
+ * Customization is possible by extending the class and overriding getters.
+ *
+ * A typical usage of this class is as follows:
+ * @Configuration
+ * public class MyJobConfiguration extends JdbcDefaultBatchConfiguration {
+ *
+ * @Bean
+ * public Job job(JobRepository jobRepository) {
+ * return new JobBuilder("myJob", jobRepository)
+ * // define job flow as needed
+ * .build();
+ * }
+ *
+ * }
+ *
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ */
+@Configuration(proxyBeanMethods = false)
+public class JdbcDefaultBatchConfiguration extends DefaultBatchConfiguration {
+
+ @Bean
+ @Override
+ public JobRepository jobRepository() throws BatchConfigurationException {
+ JdbcJobRepositoryFactoryBean jobRepositoryFactoryBean = new JdbcJobRepositoryFactoryBean();
+ try {
+ jobRepositoryFactoryBean.setDataSource(getDataSource());
+ jobRepositoryFactoryBean.setTransactionManager(getTransactionManager());
+ jobRepositoryFactoryBean.setDatabaseType(getDatabaseType());
+ jobRepositoryFactoryBean.setIncrementerFactory(getIncrementerFactory());
+ jobRepositoryFactoryBean.setJobKeyGenerator(getJobKeyGenerator());
+ jobRepositoryFactoryBean.setClobType(getClobType());
+ jobRepositoryFactoryBean.setTablePrefix(getTablePrefix());
+ jobRepositoryFactoryBean.setSerializer(getExecutionContextSerializer());
+ jobRepositoryFactoryBean.setConversionService(getConversionService());
+ jobRepositoryFactoryBean.setJdbcOperations(getJdbcOperations());
+ jobRepositoryFactoryBean.setCharset(getCharset());
+ jobRepositoryFactoryBean.setMaxVarCharLength(getMaxVarCharLength());
+ jobRepositoryFactoryBean.setIsolationLevelForCreateEnum(getIsolationLevelForCreate());
+ jobRepositoryFactoryBean.setValidateTransactionState(getValidateTransactionState());
+ jobRepositoryFactoryBean.afterPropertiesSet();
+ return jobRepositoryFactoryBean.getObject();
+ }
+ catch (Exception e) {
+ throw new BatchConfigurationException("Unable to configure the default job repository", e);
+ }
+ }
+
+ /*
+ * Getters to customize the configuration of infrastructure beans
+ */
+
+ /**
+ * Return the data source to use for Batch meta-data. Defaults to the bean of type
+ * {@link DataSource} and named "dataSource" in the application context.
+ * @return The data source to use for Batch meta-data
+ */
+ protected DataSource getDataSource() {
+ String errorMessage = " To use the default configuration, a data source bean named 'dataSource'"
+ + " should be defined in the application context but none was found. Override getDataSource()"
+ + " to provide the data source to use for Batch meta-data.";
+ if (this.applicationContext.getBeansOfType(DataSource.class).isEmpty()) {
+ throw new BatchConfigurationException(
+ "Unable to find a DataSource bean in the application context." + errorMessage);
+ }
+ else {
+ if (!this.applicationContext.containsBean("dataSource")) {
+ throw new BatchConfigurationException(errorMessage);
+ }
+ }
+ return this.applicationContext.getBean("dataSource", DataSource.class);
+ }
+
+ @Override
+ protected PlatformTransactionManager getTransactionManager() {
+ String errorMessage = " To use the default configuration, a PlatformTransactionManager bean named 'transactionManager'"
+ + " should be defined in the application context but none was found. Override getTransactionManager()"
+ + " to provide the transaction manager to use for the job repository.";
+ if (this.applicationContext.getBeansOfType(PlatformTransactionManager.class).isEmpty()) {
+ throw new BatchConfigurationException(
+ "Unable to find a PlatformTransactionManager bean in the application context." + errorMessage);
+ }
+ else {
+ if (!this.applicationContext.containsBean("transactionManager")) {
+ throw new BatchConfigurationException(errorMessage);
+ }
+ }
+ return this.applicationContext.getBean("transactionManager", PlatformTransactionManager.class);
+ }
+
+ /**
+ * Return the length of long string columns in database. Do not override this if you
+ * haven't modified the schema. Note this value will be used for the exit message in
+ * both {@link JdbcJobExecutionDao} and {@link JdbcStepExecutionDao} and also the
+ * short version of the execution context in {@link JdbcExecutionContextDao} . For
+ * databases with multi-byte character sets this number can be smaller (by up to a
+ * factor of 2 for 2-byte characters) than the declaration of the column length in the
+ * DDL for the tables. Defaults to
+ * {@link AbstractJdbcBatchMetadataDao#DEFAULT_EXIT_MESSAGE_LENGTH}
+ */
+ protected int getMaxVarCharLength() {
+ return AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
+ }
+
+ /**
+ * Return the prefix of Batch meta-data tables. Defaults to
+ * {@link AbstractJdbcBatchMetadataDao#DEFAULT_TABLE_PREFIX}.
+ * @return the prefix of meta-data tables
+ */
+ protected String getTablePrefix() {
+ return AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
+ }
+
+ /**
+ * Return the {@link Charset} to use when serializing/deserializing the execution
+ * context. Defaults to "UTF-8".
+ * @return the charset to use when serializing/deserializing the execution context
+ */
+ protected Charset getCharset() {
+ return StandardCharsets.UTF_8;
+ }
+
+ /**
+ * Return the {@link JdbcOperations}. If this property is not overridden, a new
+ * {@link JdbcTemplate} will be created for the configured data source by default.
+ * @return the {@link JdbcOperations} to use
+ */
+ protected JdbcOperations getJdbcOperations() {
+ return new JdbcTemplate(getDataSource());
+ }
+
+ /**
+ * A custom implementation of the {@link ExecutionContextSerializer}. The default, if
+ * not injected, is the {@link DefaultExecutionContextSerializer}.
+ * @return the serializer to use to serialize/deserialize the execution context
+ */
+ protected ExecutionContextSerializer getExecutionContextSerializer() {
+ return new DefaultExecutionContextSerializer();
+ }
+
+ /**
+ * Return the value from {@link Types} class to indicate the type to use for a CLOB
+ * @return the value from {@link Types} class to indicate the type to use for a CLOB
+ */
+ protected int getClobType() {
+ return Types.CLOB;
+ }
+
+ /**
+ * Return the factory for creating {@link DataFieldMaxValueIncrementer}
+ * implementations used to increment entity IDs in meta-data tables.
+ * @return the factory for creating {@link DataFieldMaxValueIncrementer}
+ * implementations.
+ */
+ protected DataFieldMaxValueIncrementerFactory getIncrementerFactory() {
+ return new DefaultDataFieldMaxValueIncrementerFactory(getDataSource());
+ }
+
+ /**
+ * Return the database type. The default will be introspected from the JDBC meta-data
+ * of the data source.
+ * @return the database type
+ * @throws MetaDataAccessException if an error occurs when trying to get the database
+ * type of JDBC meta-data
+ *
+ */
+ protected String getDatabaseType() throws MetaDataAccessException {
+ return DatabaseType.fromMetaData(getDataSource()).name();
+ }
+
+ /**
+ * Return the conversion service to use in the job repository and job explorer. This
+ * service is used to convert job parameters from String literal to typed values and
+ * vice versa.
+ * @return the {@link ConfigurableConversionService} to use.
+ */
+ protected ConfigurableConversionService getConversionService() {
+ DefaultConversionService conversionService = new DefaultConversionService();
+ conversionService.addConverter(new DateToStringConverter());
+ conversionService.addConverter(new StringToDateConverter());
+ conversionService.addConverter(new LocalDateToStringConverter());
+ conversionService.addConverter(new StringToLocalDateConverter());
+ conversionService.addConverter(new LocalTimeToStringConverter());
+ conversionService.addConverter(new StringToLocalTimeConverter());
+ conversionService.addConverter(new LocalDateTimeToStringConverter());
+ conversionService.addConverter(new StringToLocalDateTimeConverter());
+ return conversionService;
+ }
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListener.java
index 3ed14c2974..b55ce50e71 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,8 +27,10 @@
* Generic service that can bind and unbind a {@link JobFactory} in a {@link JobRegistry}.
*
* @author Dave Syer
- *
+ * @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class JobFactoryRegistrationListener {
private final Log logger = LogFactory.getLog(getClass());
@@ -53,7 +55,7 @@ public void bind(JobFactory jobFactory, Map params) throws Exception
if (logger.isInfoEnabled()) {
logger.info("Binding JobFactory: " + jobFactory.getJobName());
}
- jobRegistry.register(jobFactory);
+ jobRegistry.register(jobFactory.createJob());
}
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobLoader.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobLoader.java
index e4821843fe..1b4288c785 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobLoader.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2022 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -17,13 +17,16 @@
import java.util.Collection;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
/**
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
* @since 2.1
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public interface JobLoader {
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java
deleted file mode 100644
index 1f6ba7acfa..0000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2006-2024 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.configuration.support;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.configuration.JobLocator;
-import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.util.Assert;
-
-/**
- * A {@link BeanPostProcessor} that registers {@link Job} beans with a
- * {@link JobRegistry}. Include a bean of this type along with your job configuration and
- * use the same {@link JobRegistry} as a {@link JobLocator} when you need to locate a
- * {@link Job} to launch.
- *
- * An alternative to this class is {@link JobRegistrySmartInitializingSingleton}, which is
- * recommended in cases where this class may cause early bean initializations. You must
- * include at most one of either of them as a bean.
- *
- * @deprecated since 5.2 in favor of {@link JobRegistrySmartInitializingSingleton}.
- * @author Dave Syer
- * @author Mahmoud Ben Hassine
- *
- */
-@Deprecated(since = "5.2")
-public class JobRegistryBeanPostProcessor
- implements BeanPostProcessor, BeanFactoryAware, InitializingBean, DisposableBean {
-
- private static final Log logger = LogFactory.getLog(JobRegistryBeanPostProcessor.class);
-
- // It doesn't make sense for this to have a default value...
- private JobRegistry jobRegistry = null;
-
- private final Collection jobNames = new HashSet<>();
-
- private String groupName = null;
-
- private DefaultListableBeanFactory beanFactory;
-
- /**
- * The group name for jobs registered by this component. Optional (defaults to null,
- * which means that jobs are registered with their bean names). Useful where there is
- * a hierarchy of application contexts all contributing to the same
- * {@link JobRegistry}: child contexts can then define an instance with a unique group
- * name to avoid clashes between job names.
- * @param groupName the groupName to set
- */
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- /**
- * Injection setter for {@link JobRegistry}.
- * @param jobRegistry the jobConfigurationRegistry to set
- */
- public void setJobRegistry(JobRegistry jobRegistry) {
- this.jobRegistry = jobRegistry;
- }
-
- @Override
- public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
- if (beanFactory instanceof DefaultListableBeanFactory) {
- this.beanFactory = (DefaultListableBeanFactory) beanFactory;
- }
- }
-
- /**
- * Make sure the registry is set before use.
- *
- * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
- */
- @Override
- public void afterPropertiesSet() throws Exception {
- Assert.state(jobRegistry != null, "JobRegistry must not be null");
- }
-
- /**
- * Unregister all the {@link Job} instances that were registered by this post
- * processor.
- * @see org.springframework.beans.factory.DisposableBean#destroy()
- */
- @Override
- public void destroy() throws Exception {
- for (String name : jobNames) {
- if (logger.isDebugEnabled()) {
- logger.debug("Unregistering job: " + name);
- }
- jobRegistry.unregister(name);
- }
- jobNames.clear();
- }
-
- /**
- * If the bean is an instance of {@link Job}, then register it.
- * @throws FatalBeanException if there is a {@link DuplicateJobException}.
- *
- * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object,
- * java.lang.String)
- */
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (bean instanceof Job job) {
- try {
- String groupName = this.groupName;
- if (beanFactory != null && beanFactory.containsBean(beanName)) {
- groupName = getGroupName(beanFactory.getBeanDefinition(beanName), job);
- }
- job = groupName == null ? job : new GroupAwareJob(groupName, job);
- ReferenceJobFactory jobFactory = new ReferenceJobFactory(job);
- String name = jobFactory.getJobName();
- if (logger.isDebugEnabled()) {
- logger.debug("Registering job: " + name);
- }
- jobRegistry.register(jobFactory);
- jobNames.add(name);
- }
- catch (DuplicateJobException e) {
- throw new FatalBeanException("Cannot register job configuration", e);
- }
- return job;
- }
- return bean;
- }
-
- /**
- * Determine a group name for the job to be registered. The default implementation
- * returns the {@link #setGroupName(String) groupName} configured. Provides an
- * extension point for specialised subclasses.
- * @param beanDefinition the bean definition for the job
- * @param job the job
- * @return a group name for the job (or null if not needed)
- */
- protected String getGroupName(BeanDefinition beanDefinition, Job job) {
- return groupName;
- }
-
- /**
- * Do nothing.
- *
- * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object,
- * java.lang.String)
- */
- @Override
- public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
- return bean;
- }
-
-}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingleton.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingleton.java
index ede418cf23..aafa8b4a49 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingleton.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingleton.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.JobLocator;
import org.springframework.batch.core.configuration.JobRegistry;
@@ -42,13 +42,13 @@
* {@link JobRegistry}. Include a bean of this type along with your job configuration and
* use the same {@link JobRegistry} as a {@link JobLocator} when you need to locate a
* {@link Job} to launch.
- *
- * This class is an alternative to {@link JobRegistryBeanPostProcessor} and prevents early
- * bean initializations. You must include at most one of either of them as a bean.
*
* @author Henning Pöttker
* @since 5.1.1
+ * @deprecated since 6.0 with no replacement. Register a {@link MapJobRegistry} as a bean,
+ * and it will automatically register all {@link Job} beans in the application context.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class JobRegistrySmartInitializingSingleton
implements SmartInitializingSingleton, BeanFactoryAware, InitializingBean, DisposableBean {
@@ -146,12 +146,11 @@ private void postProcessAfterInitialization(Job job, String beanName) {
groupName = getGroupName(defaultListableBeanFactory.getBeanDefinition(beanName), job);
}
job = groupName == null ? job : new GroupAwareJob(groupName, job);
- ReferenceJobFactory jobFactory = new ReferenceJobFactory(job);
- String name = jobFactory.getJobName();
+ String name = job.getName();
if (logger.isDebugEnabled()) {
logger.debug("Registering job: " + name);
}
- jobRegistry.register(jobFactory);
+ jobRegistry.register(job);
jobNames.add(name);
}
catch (DuplicateJobException e) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java
index 3e55bedc0c..9058740855 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2019 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,68 +16,89 @@
package org.springframework.batch.core.configuration.support;
import java.util.Collections;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.springframework.batch.core.Job;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.configuration.JobFactory;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
- * Simple, thread-safe, map-based implementation of {@link JobRegistry}.
+ * Simple, thread-safe, map-based implementation of {@link JobRegistry}. This registry is
+ * a {@link SmartInitializingSingleton} that is automatically populated with all
+ * {@link Job} beans in the {@link ApplicationContext}.
*
* @author Dave Syer
* @author Robert Fischer
* @author Mahmoud Ben Hassine
*/
-public class MapJobRegistry implements JobRegistry {
+public class MapJobRegistry implements JobRegistry, SmartInitializingSingleton, ApplicationContextAware {
+
+ protected final Log logger = LogFactory.getLog(getClass());
/**
- * The map holding the registered job factories.
+ * The map holding the registered jobs.
*/
- // The "final" ensures that it is visible and initialized when the constructor
- // resolves.
- private final ConcurrentMap map = new ConcurrentHashMap<>();
+ private final ConcurrentMap map = new ConcurrentHashMap<>();
+
+ private ApplicationContext applicationContext;
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ this.applicationContext = applicationContext;
+ }
+
+ @Override
+ public void afterSingletonsInstantiated() {
+ Map jobBeans = this.applicationContext.getBeansOfType(Job.class);
+ this.map.putAll(jobBeans);
+ }
@Override
- public void register(JobFactory jobFactory) throws DuplicateJobException {
- Assert.notNull(jobFactory, "jobFactory is null");
- String name = jobFactory.getJobName();
- Assert.notNull(name, "Job configuration must have a name.");
- JobFactory previousValue = map.putIfAbsent(name, jobFactory);
+ public void register(Job job) throws DuplicateJobException {
+ Assert.notNull(job, "job must not be null");
+ String jobName = job.getName();
+ Assert.notNull(jobName, "Job name must not be null");
+ Job previousValue = this.map.putIfAbsent(jobName, job);
if (previousValue != null) {
- throw new DuplicateJobException("A job configuration with this name [" + name + "] was already registered");
+ throw new DuplicateJobException("A job with this name [" + jobName + "] was already registered");
}
}
@Override
public void unregister(String name) {
- Assert.notNull(name, "Job configuration must have a name.");
- map.remove(name);
+ Assert.notNull(name, "Job name must not be null");
+ this.map.remove(name);
}
@Override
public Job getJob(@Nullable String name) throws NoSuchJobException {
- JobFactory factory = map.get(name);
- if (factory == null) {
- throw new NoSuchJobException("No job configuration with the name [" + name + "] was registered");
+ Job job = this.map.get(name);
+ if (job == null) {
+ throw new NoSuchJobException("No job with the name [" + name + "] was registered");
}
else {
- return factory.createJob();
+ return job;
}
}
/**
- * Provides an unmodifiable view of the job names.
+ * Provides an unmodifiable view of job names.
*/
@Override
public Set getJobNames() {
- return Collections.unmodifiableSet(map.keySet());
+ return Collections.unmodifiableSet(this.map.keySet());
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java
index 0d3aa396b9..051a44edd0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java
@@ -21,7 +21,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.StepRegistry;
import org.springframework.batch.core.launch.NoSuchJobException;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MongoDefaultBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MongoDefaultBatchConfiguration.java
new file mode 100644
index 0000000000..7f5cbb25e2
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MongoDefaultBatchConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.support;
+
+import org.springframework.batch.core.configuration.BatchConfigurationException;
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.MongoJobRepositoryFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.MongoTransactionManager;
+import org.springframework.data.mongodb.core.MongoOperations;
+
+/**
+ * Base {@link Configuration} class that provides common MongoDB-based infrastructure
+ * beans for enabling and using Spring Batch.
+ *
+ * This configuration class configures and registers the following beans in the
+ * application context:
+ *
+ *
+ *
a {@link JobRepository} named "jobRepository"
+ *
a {@link JobRegistry} named "jobRegistry"
+ *
a {@link JobOperator} named "jobOperator"
+ *
a {@link org.springframework.batch.core.scope.StepScope} named "stepScope"
+ *
a {@link org.springframework.batch.core.scope.JobScope} named "jobScope"
+ *
+ *
+ * Customization is possible by extending the class and overriding getters.
+ *
+ * A typical usage of this class is as follows:
+ * @Configuration
+ * public class MyJobConfiguration extends MongoDefaultBatchConfiguration {
+ *
+ * @Bean
+ * public Job job(JobRepository jobRepository) {
+ * return new JobBuilder("myJob", jobRepository)
+ * // define job flow as needed
+ * .build();
+ * }
+ *
+ * }
+ *
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ */
+@Configuration(proxyBeanMethods = false)
+public class MongoDefaultBatchConfiguration extends DefaultBatchConfiguration {
+
+ @Bean
+ @Override
+ public JobRepository jobRepository() throws BatchConfigurationException {
+ MongoJobRepositoryFactoryBean jobRepositoryFactoryBean = new MongoJobRepositoryFactoryBean();
+ try {
+ jobRepositoryFactoryBean.setMongoOperations(getMongoOperations());
+ jobRepositoryFactoryBean.setTransactionManager(getTransactionManager());
+ jobRepositoryFactoryBean.setIsolationLevelForCreateEnum(getIsolationLevelForCreate());
+ jobRepositoryFactoryBean.setValidateTransactionState(getValidateTransactionState());
+ jobRepositoryFactoryBean.setJobKeyGenerator(getJobKeyGenerator());
+ jobRepositoryFactoryBean.afterPropertiesSet();
+ return jobRepositoryFactoryBean.getObject();
+ }
+ catch (Exception e) {
+ throw new BatchConfigurationException("Unable to configure the default job repository", e);
+ }
+ }
+
+ /*
+ * Getters to customize the configuration of infrastructure beans
+ */
+
+ protected MongoOperations getMongoOperations() {
+ String errorMessage = " To use the default configuration, a MongoOperations bean named 'mongoTemplate'"
+ + " should be defined in the application context but none was found. Override getMongoOperations()"
+ + " to provide the MongoOperations for Batch meta-data.";
+ if (this.applicationContext.getBeansOfType(MongoOperations.class).isEmpty()) {
+ throw new BatchConfigurationException(
+ "Unable to find a MongoOperations bean in the application context." + errorMessage);
+ }
+ else {
+ if (!this.applicationContext.containsBean("mongoTemplate")) {
+ throw new BatchConfigurationException(errorMessage);
+ }
+ }
+ return this.applicationContext.getBean("mongoTemplate", MongoOperations.class);
+ }
+
+ @Override
+ protected MongoTransactionManager getTransactionManager() {
+ String errorMessage = " To use the default configuration, a MongoTransactionManager bean named 'transactionManager'"
+ + " should be defined in the application context but none was found. Override getTransactionManager()"
+ + " to provide the transaction manager to use for the job repository.";
+ if (this.applicationContext.getBeansOfType(MongoTransactionManager.class).isEmpty()) {
+ throw new BatchConfigurationException(
+ "Unable to find a MongoTransactionManager bean in the application context." + errorMessage);
+ }
+ else {
+ if (!this.applicationContext.containsBean("transactionManager")) {
+ throw new BatchConfigurationException(errorMessage);
+ }
+ }
+ return this.applicationContext.getBean("transactionManager", MongoTransactionManager.class);
+ }
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java
index 4664448c0c..aed7d306c6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.support;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.JobFactory;
/**
@@ -23,8 +23,10 @@
* {@link Job}.
*
* @author Dave Syer
- *
+ * @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class ReferenceJobFactory implements JobFactory {
private final Job job;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
index 876a9ed2ce..c378258a91 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
@@ -404,7 +404,7 @@ protected static Collection createTransition(FlowExecutionStatus
endBuilder.addConstructorArgValue(exitCodeExists ? exitCode : status.getName());
String endName = (status == FlowExecutionStatus.STOPPED ? STOP_ELE
- : status == FlowExecutionStatus.FAILED ? FAIL_ELE : END_ELE) + (endCounter++);
+ : status == FlowExecutionStatus.FAILED ? FAIL_ELE : END_ELE) + endCounter++;
endBuilder.addConstructorArgValue(endName);
endBuilder.addConstructorArgValue(abandon);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
index c12eaf8633..73ef8f82cc 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
@@ -20,6 +20,7 @@
import org.w3c.dom.NodeList;
import org.springframework.batch.core.listener.StepListenerMetaData;
+import org.springframework.batch.core.step.Step;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -35,9 +36,9 @@
/**
* Internal parser for the <step/> elements inside a job. A step element references
- * a bean definition for a {@link org.springframework.batch.core.Step} and goes on to
- * (optionally) list a set of transitions from that step to others with <next
- * on="pattern" to="stepName"/>. Used by the {@link JobParser}.
+ * a bean definition for a {@link Step} and goes on to (optionally) list a set of
+ * transitions from that step to others with <next on="pattern" to="stepName"/>.
+ * Used by the {@link JobParser}.
*
* @author Dave Syer
* @author Thomas Risberg
@@ -118,16 +119,13 @@ protected AbstractBeanDefinition parseStep(Element stepElement, ParserContext pa
new TaskletParser().parseTasklet(stepElement, nestedElement, bd, parserContext, stepUnderspecified);
}
else if (FLOW_ELE.equals(name)) {
- boolean stepUnderspecified = CoreNamespaceUtils.isUnderspecified(stepElement);
- parseFlow(stepElement, nestedElement, bd, parserContext, stepUnderspecified);
+ parseFlow(stepElement, nestedElement, bd);
}
else if (PARTITION_ELE.equals(name)) {
- boolean stepUnderspecified = CoreNamespaceUtils.isUnderspecified(stepElement);
- parsePartition(stepElement, nestedElement, bd, parserContext, stepUnderspecified, jobFactoryRef);
+ parsePartition(stepElement, nestedElement, bd, parserContext, jobFactoryRef);
}
else if (JOB_ELE.equals(name)) {
- boolean stepUnderspecified = CoreNamespaceUtils.isUnderspecified(stepElement);
- parseJob(stepElement, nestedElement, bd, parserContext, stepUnderspecified);
+ parseJob(nestedElement, bd, parserContext);
}
else if ("description".equals(name)) {
bd.setDescription(nestedElement.getTextContent());
@@ -199,7 +197,7 @@ else if (ns.equals("http://www.springframework.org/schema/batch")) {
}
private void parsePartition(Element stepElement, Element partitionElement, AbstractBeanDefinition bd,
- ParserContext parserContext, boolean stepUnderspecified, String jobFactoryRef) {
+ ParserContext parserContext, String jobFactoryRef) {
bd.setBeanClass(StepParserStepFactoryBean.class);
bd.setAttribute("isNamespaceStep", true);
@@ -258,8 +256,7 @@ else if (inlineStepElement != null) {
}
- private void parseJob(Element stepElement, Element jobElement, AbstractBeanDefinition bd,
- ParserContext parserContext, boolean stepUnderspecified) {
+ private void parseJob(Element jobElement, AbstractBeanDefinition bd, ParserContext parserContext) {
bd.setBeanClass(StepParserStepFactoryBean.class);
bd.setAttribute("isNamespaceStep", true);
@@ -285,8 +282,7 @@ private void parseJob(Element stepElement, Element jobElement, AbstractBeanDefin
}
- private void parseFlow(Element stepElement, Element flowElement, AbstractBeanDefinition bd,
- ParserContext parserContext, boolean stepUnderspecified) {
+ private void parseFlow(Element stepElement, Element flowElement, AbstractBeanDefinition bd) {
bd.setBeanClass(StepParserStepFactoryBean.class);
bd.setAttribute("isNamespaceStep", true);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java
index 7f250d389c..cbaed045bb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -115,23 +115,21 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) thro
* @return the bean with default collaborators injected into it
*/
private Object injectDefaults(Object bean) {
- if (bean instanceof JobParserJobFactoryBean) {
- JobParserJobFactoryBean fb = (JobParserJobFactoryBean) bean;
+ if (bean instanceof JobParserJobFactoryBean fb) {
JobRepository jobRepository = fb.getJobRepository();
if (jobRepository == null) {
- fb.setJobRepository((JobRepository) applicationContext.getBean(DEFAULT_JOB_REPOSITORY_NAME));
+ fb.setJobRepository(applicationContext.getBean(DEFAULT_JOB_REPOSITORY_NAME, JobRepository.class));
}
}
- else if (bean instanceof StepParserStepFactoryBean) {
- StepParserStepFactoryBean fb = (StepParserStepFactoryBean) bean;
+ else if (bean instanceof StepParserStepFactoryBean fb) {
JobRepository jobRepository = fb.getJobRepository();
if (jobRepository == null) {
- fb.setJobRepository((JobRepository) applicationContext.getBean(DEFAULT_JOB_REPOSITORY_NAME));
+ fb.setJobRepository(applicationContext.getBean(DEFAULT_JOB_REPOSITORY_NAME, JobRepository.class));
}
PlatformTransactionManager transactionManager = fb.getTransactionManager();
if (transactionManager == null && fb.requiresTransactionManager()) {
fb.setTransactionManager(
- (PlatformTransactionManager) applicationContext.getBean(DEFAULT_TRANSACTION_MANAGER_NAME));
+ applicationContext.getBean(DEFAULT_TRANSACTION_MANAGER_NAME, PlatformTransactionManager.class));
}
}
return bean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java
index 382a7b6d97..de8aff9119 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java
@@ -32,8 +32,8 @@ public ManagedMap parse(Element element, ParserContex
if (children.size() == 1) {
ManagedMap map = new ManagedMap<>();
Element exceptionClassesElement = children.get(0);
- addExceptionClasses("include", true, exceptionClassesElement, map, parserContext);
- addExceptionClasses("exclude", false, exceptionClassesElement, map, parserContext);
+ addExceptionClasses("include", true, exceptionClassesElement, map);
+ addExceptionClasses("exclude", false, exceptionClassesElement, map);
map.put(new TypedStringValue(ForceRollbackForWriteSkipException.class.getName(), Class.class), true);
return map;
}
@@ -46,7 +46,7 @@ else if (children.size() > 1) {
}
private void addExceptionClasses(String elementName, boolean include, Element exceptionClassesElement,
- ManagedMap map, ParserContext parserContext) {
+ ManagedMap map) {
for (Element child : DomUtils.getChildElementsByTagName(exceptionClassesElement, elementName)) {
String className = child.getAttribute("class");
map.put(new TypedStringValue(className, Class.class), include);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
index 22fa9bb18c..4e9123a0bc 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
@@ -18,6 +18,7 @@
import java.util.Collection;
import org.springframework.batch.core.job.flow.support.state.StepState;
+import org.springframework.batch.core.step.Step;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -27,9 +28,9 @@
/**
* Internal parser for the <step/> elements inside a job. A step element references
- * a bean definition for a {@link org.springframework.batch.core.Step} and goes on to
- * (optionally) list a set of transitions from that step to others with <next
- * on="pattern" to="stepName"/>. Used by the {@link JobParser}.
+ * a bean definition for a {@link Step} and goes on to (optionally) list a set of
+ * transitions from that step to others with <next on="pattern" to="stepName"/>.
+ * Used by the {@link JobParser}.
*
* @see JobParser
* @author Dave Syer
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java
index 8254cd66d8..9931c03172 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java
@@ -18,6 +18,7 @@
import java.util.Arrays;
import java.util.List;
+import org.springframework.batch.core.job.Job;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -33,7 +34,7 @@
/**
* Parser for the <job/> element in the Batch namespace. Sets up and returns a bean
- * definition for a {@link org.springframework.batch.core.Job}.
+ * definition for a {@link Job}.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
@@ -103,7 +104,7 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
builder.addPropertyValue("restartable", restartableAttribute);
}
- String incrementer = (element.getAttribute("incrementer"));
+ String incrementer = element.getAttribute("incrementer");
if (StringUtils.hasText(incrementer)) {
builder.addPropertyReference("jobParametersIncrementer", incrementer);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java
index b46ff39874..cd299c48ee 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowJob;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
index be88087562..730296ea77 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,6 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -28,7 +29,7 @@
/**
* Parser for the <job-repository/> element in the Batch namespace. Sets up and
- * returns a JobRepositoryFactoryBean.
+ * returns a {@link JdbcJobRepositoryFactoryBean}.
*
* @author Thomas Risberg
* @author Mahmoud Ben Hassine
@@ -39,7 +40,7 @@ public class JobRepositoryParser extends AbstractSingleBeanDefinitionParser {
@Override
protected String getBeanClassName(Element element) {
- return "org.springframework.batch.core.repository.support.JobRepositoryFactoryBean";
+ return "org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean";
}
@Override
@@ -57,7 +58,7 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
/**
* Parse and create a bean definition for a
- * {@link org.springframework.batch.core.repository.support.JobRepositoryFactoryBean}
+ * {@link org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean}
* .
*/
@Override
@@ -77,8 +78,6 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
String maxVarCharLength = element.getAttribute("max-varchar-length");
- String lobHandler = element.getAttribute("lob-handler");
-
String serializer = element.getAttribute("serializer");
String conversionService = element.getAttribute("conversion-service");
@@ -97,9 +96,6 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
if (StringUtils.hasText(tablePrefix)) {
builder.addPropertyValue("tablePrefix", tablePrefix);
}
- if (StringUtils.hasText(lobHandler)) {
- builder.addPropertyReference("lobHandler", lobHandler);
- }
if (StringUtils.hasText(maxVarCharLength)) {
builder.addPropertyValue("maxVarCharLength", maxVarCharLength);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java
index 216935b2ef..85fc80fe1d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java
@@ -205,7 +205,7 @@ public FlowExecutionStatus handle(FlowExecutor executor) throws Exception {
@Override
public Collection getFlows() {
- return (state instanceof FlowHolder) ? ((FlowHolder) state).getFlows() : Collections.emptyList();
+ return (state instanceof FlowHolder flowHolder) ? flowHolder.getFlows() : Collections.emptyList();
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StandaloneStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StandaloneStepParser.java
index 2b07ad9677..ad39ddcffe 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StandaloneStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StandaloneStepParser.java
@@ -15,13 +15,14 @@
*/
package org.springframework.batch.core.configuration.xml;
+import org.springframework.batch.core.step.Step;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
/**
* Internal parser for the <step/> elements for a job. A step element references a
- * bean definition for a {@link org.springframework.batch.core.Step}.
+ * bean definition for a {@link Step}.
*
* @author Dave Syer
* @author Thomas Risberg
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
index 7b18458ee7..67e745d58d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,20 +23,20 @@
import java.util.Map;
import java.util.Set;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.ItemProcessListener;
+import org.springframework.batch.core.listener.ItemReadListener;
+import org.springframework.batch.core.listener.ItemWriteListener;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.job.flow.Flow;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.partition.PartitionHandler;
-import org.springframework.batch.core.partition.support.Partitioner;
-import org.springframework.batch.core.partition.support.StepExecutionAggregator;
+import org.springframework.batch.core.partition.Partitioner;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.builder.AbstractTaskletStepBuilder;
@@ -61,7 +61,6 @@
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.repeat.CompletionPolicy;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
-import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.classify.BinaryExceptionClassifier;
@@ -126,7 +125,7 @@ public class StepParserStepFactoryBean implements FactoryBean, BeanN
//
private Job job;
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
private JobParametersExtractor jobParametersExtractor;
@@ -185,8 +184,6 @@ public class StepParserStepFactoryBean implements FactoryBean, BeanN
private TaskExecutor taskExecutor;
- private Integer throttleLimit;
-
private ItemReader itemReader;
private ItemProcessor itemProcessor;
@@ -275,8 +272,8 @@ protected void enhanceCommonStep(StepBuilderHelper builder) {
builder.startLimit(startLimit);
}
for (Object listener : stepExecutionListeners) {
- if (listener instanceof StepExecutionListener) {
- builder.listener((StepExecutionListener) listener);
+ if (listener instanceof StepExecutionListener stepExecutionListener) {
+ builder.listener(stepExecutionListener);
}
}
}
@@ -473,9 +470,6 @@ protected void enhanceTaskletStepBuilder(AbstractTaskletStepBuilder builder)
}
builder.taskExecutor(taskExecutor);
- if (throttleLimit != null) {
- builder.throttleLimit(throttleLimit);
- }
builder.transactionManager(transactionManager);
if (transactionTimeout != null || propagation != null || isolation != null
|| noRollbackExceptionClasses != null) {
@@ -522,7 +516,7 @@ private Step createJobStep() throws Exception {
JobStepBuilder builder = new StepBuilder(name, jobRepository).job(job);
enhanceCommonStep(builder);
builder.parametersExtractor(jobParametersExtractor);
- builder.launcher(jobLauncher);
+ builder.operator(jobOperator);
return builder.build();
}
@@ -571,14 +565,14 @@ private void validateDependency(String dependentName, Object dependentValue, Str
* @return {@code true} if the object has a value
*/
private boolean isPresent(Object o) {
- if (o instanceof Integer) {
- return isPositive((Integer) o);
+ if (o instanceof Integer i) {
+ return isPositive(i);
}
- if (o instanceof Collection) {
- return !((Collection) o).isEmpty();
+ if (o instanceof Collection collection) {
+ return !collection.isEmpty();
}
- if (o instanceof Map) {
- return !((Map) o).isEmpty();
+ if (o instanceof Map map) {
+ return !map.isEmpty();
}
return o != null;
}
@@ -662,8 +656,8 @@ public void setJobParametersExtractor(JobParametersExtractor jobParametersExtrac
this.jobParametersExtractor = jobParametersExtractor;
}
- public void setJobLauncher(JobLauncher jobLauncher) {
- this.jobLauncher = jobLauncher;
+ public void setJobOperator(JobOperator jobOperator) {
+ this.jobOperator = jobOperator;
}
// =========================================================
@@ -992,19 +986,6 @@ public void setTaskExecutor(TaskExecutor taskExecutor) {
this.taskExecutor = taskExecutor;
}
- /**
- * Public setter for the throttle limit. This limits the number of tasks queued for
- * concurrent processing to prevent thread pools from being overwhelmed. Defaults to
- * {@link TaskExecutorRepeatTemplate#DEFAULT_THROTTLE_LIMIT}.
- * @param throttleLimit The throttle limit to set.
- * @deprecated since 5.0, scheduled for removal in 6.0. This API is not intended for
- * end users anyway. It is only used by the XML namespace parser.
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public void setThrottleLimit(Integer throttleLimit) {
- this.throttleLimit = throttleLimit;
- }
-
/**
* @param itemReader The {@link ItemReader} to set.
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java
index a1a6668579..0f316b81ed 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java
@@ -213,7 +213,7 @@ private void handleExceptionElement(Element element, ParserContext parserContext
ManagedList list = new ManagedList<>();
list.setMergeEnabled(exceptionClassesElement.hasAttribute(MERGE_ATTR)
&& Boolean.parseBoolean(exceptionClassesElement.getAttribute(MERGE_ATTR)));
- addExceptionClasses("include", exceptionClassesElement, list, parserContext);
+ addExceptionClasses("include", exceptionClassesElement, list);
propertyValues.addPropertyValue(propertyName, list);
}
else if (children.size() > 1) {
@@ -224,7 +224,7 @@ else if (children.size() > 1) {
}
private void addExceptionClasses(String elementName, Element exceptionClassesElement,
- ManagedList list, ParserContext parserContext) {
+ ManagedList list) {
for (Element child : DomUtils.getChildElementsByTagName(exceptionClassesElement, elementName)) {
String className = child.getAttribute("class");
list.add(new TypedStringValue(className, Class.class));
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TopLevelStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TopLevelStepParser.java
index 19f5fffb80..297c6ef6bb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TopLevelStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TopLevelStepParser.java
@@ -15,6 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
+import org.springframework.batch.core.step.Step;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
@@ -22,7 +23,7 @@
/**
* Parser for the <step/> top level element in the Batch namespace. Sets up and
- * returns a bean definition for a {@link org.springframework.batch.core.Step}.
+ * returns a bean definition for a {@link Step}.
*
* @author Thomas Risberg
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
index a9f671ca56..454c691872 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
@@ -19,9 +19,9 @@
import java.util.Map.Entry;
import java.util.Properties;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.core.convert.support.ConfigurableConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.lang.NonNull;
@@ -108,7 +108,7 @@ public JobParameters getJobParameters(@Nullable Properties properties) {
}
/**
- * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters)
+ * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(JobParameters)
*/
@Override
public Properties getProperties(@Nullable JobParameters jobParameters) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java
index 60d9f58ab5..128938f48f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java
index c7a0c784f7..a38b071c0f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java
@@ -18,8 +18,8 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
/**
* Converter for {@link JobParameters} instances that uses a JSON naming convention for
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
index 34d6d19f58..7c60e2da7a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -32,17 +32,13 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
+import org.springframework.batch.core.listener.JobExecutionListener;
import org.springframework.batch.core.SpringBatchVersion;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.launch.support.ExitCodeMapper;
import org.springframework.batch.core.listener.CompositeJobExecutionListener;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/DefaultJobKeyGenerator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobKeyGenerator.java
similarity index 86%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/DefaultJobKeyGenerator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobKeyGenerator.java
index 9944fdfadd..5da1bcde58 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/DefaultJobKeyGenerator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobKeyGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -21,6 +21,8 @@
import java.util.List;
import java.util.Map;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.util.Assert;
import org.springframework.util.DigestUtils;
@@ -34,7 +36,7 @@
* @author Mahmoud Ben Hassine
* @since 2.2
*/
-public class DefaultJobKeyGenerator implements JobKeyGenerator {
+public class DefaultJobKeyGenerator implements JobKeyGenerator {
/**
* Generates the job key to be used based on the {@link JobParameters} instance
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/Job.java
similarity index 89%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/Job.java
index fe0d0fbf15..80fdd5583b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/Job.java
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
-import org.springframework.batch.core.job.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecution.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecution.java
index c595f43e40..bfccba5e4b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecution.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -28,6 +28,9 @@
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.springframework.batch.core.*;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.lang.Nullable;
@@ -203,7 +206,7 @@ public void upgradeStatus(BatchStatus status) {
/**
* Convenience getter for the {@code id} of the enclosing job. Useful for DAO
* implementations.
- * @return the @{code id} of the enclosing job.
+ * @return the {@code id} of the enclosing job.
*/
public Long getJobId() {
if (jobInstance != null) {
@@ -302,11 +305,10 @@ public void setCreateTime(LocalDateTime createTime) {
}
/**
- * Package-private method for re-constituting the step executions from existing
- * instances.
+ * Add a step execution from an existing instance.
* @param stepExecution The {@code stepExecution} execution to be added.
*/
- void addStepExecution(StepExecution stepExecution) {
+ public void addStepExecution(StepExecution stepExecution) {
stepExecutions.add(stepExecution);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecutionException.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecutionException.java
index f64cd022ef..c808e40845 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecutionException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
/**
* Root of exception hierarchy for checked exceptions in job and step execution. Clients
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInstance.java
similarity index 93%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInstance.java
index cecdc5481e..0feb0dfa7a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInstance.java
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
+import org.springframework.batch.core.Entity;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.util.Assert;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInterruptedException.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInterruptedException.java
index 8ba4c75832..7282e81894 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInterruptedException.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
+
+import org.springframework.batch.core.BatchStatus;
/**
* Exception to indicate the job has been interrupted. The exception state indicated is
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobKeyGenerator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobKeyGenerator.java
similarity index 81%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobKeyGenerator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/JobKeyGenerator.java
index 147a26a37c..36371d5ebd 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobKeyGenerator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobKeyGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2025 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.
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
+
+import org.springframework.batch.core.job.parameters.JobParameters;
/**
* Strategy interface for the generation of the key used in identifying unique
@@ -22,11 +24,10 @@
* @author Michael Minella
* @author Mahmoud Ben Hassine
* @author Taeik Lim
- * @param The type of the source data used to calculate the key.
* @since 2.2
*/
@FunctionalInterface
-public interface JobKeyGenerator {
+public interface JobKeyGenerator {
/**
* Method to generate the unique key used to identify a job instance.
@@ -34,6 +35,6 @@ public interface JobKeyGenerator {
* {@code null}).
* @return a unique string identifying the job based on the information supplied.
*/
- String generateKey(T source);
+ String generateKey(JobParameters source);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
index b22317ef28..d2d2db1825 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
@@ -21,12 +21,8 @@
import java.util.List;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.core.step.StepLocator;
@@ -79,8 +75,8 @@ public Collection getStepNames() {
for (Step step : steps) {
names.add(step.getName());
- if (step instanceof StepLocator) {
- names.addAll(((StepLocator) step).getStepNames());
+ if (step instanceof StepLocator stepLocator) {
+ names.addAll(stepLocator.getStepNames());
}
}
return names;
@@ -100,8 +96,8 @@ public Step getStep(String stepName) {
if (step.getName().equals(stepName)) {
return step;
}
- else if (step instanceof StepLocator) {
- Step result = ((StepLocator) step).getStep(stepName);
+ else if (step instanceof StepLocator stepLocator) {
+ Step result = stepLocator.getStep(stepName);
if (result != null) {
return result;
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java
index 930ab7f0cb..3693272865 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java
@@ -19,12 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.item.ExecutionContext;
@@ -179,8 +175,7 @@ public StepExecution handleStep(Step step, JobExecution execution)
* Detect whether a step execution belongs to this job execution.
* @param jobExecution the current job execution
* @param stepExecution an existing step execution
- * @return true if the {@link org.springframework.batch.core.StepExecution} is part of
- * the {@link org.springframework.batch.core.JobExecution}
+ * @return true if the {@link StepExecution} is part of the {@link JobExecution}
*/
private boolean stepExecutionPartOfExistingJobExecution(JobExecution jobExecution, StepExecution stepExecution) {
return stepExecution != null && stepExecution.getJobExecutionId() != null
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StartLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/StartLimitExceededException.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/StartLimitExceededException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/StartLimitExceededException.java
index 46e6582585..90eb31eb3d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/StartLimitExceededException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/StartLimitExceededException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
/**
* Indicates the step's start limit has been exceeded.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/StepHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/StepHandler.java
index ebe18808e3..59052f6512 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/StepHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/StepHandler.java
@@ -16,12 +16,8 @@
package org.springframework.batch.core.job;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRestartException;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/UnexpectedJobExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/UnexpectedJobExecutionException.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/UnexpectedJobExecutionException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/UnexpectedJobExecutionException.java
index eda11002f3..82cecb6aeb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/UnexpectedJobExecutionException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/UnexpectedJobExecutionException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
/**
* Indicates to the framework that a critical error has occurred and processing should
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
index 17d3559471..963e7bb92f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
@@ -25,7 +25,7 @@
import java.util.Set;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
@@ -238,8 +238,8 @@ protected Flow flow() {
}
flow = new SimpleFlow(name);
// optimization for flows that only have one state that itself is a flow:
- if (currentState instanceof FlowState && states.size() == 1) {
- return ((FlowState) currentState).getFlows().iterator().next();
+ if (currentState instanceof FlowState flowState && states.size() == 1) {
+ return flowState.getFlows().iterator().next();
}
addDanglingEndStates();
flow.setStateTransitions(transitions);
@@ -282,23 +282,21 @@ private void doFrom(Object input) {
private State createState(Object input) {
State result;
- if (input instanceof Step) {
+ if (input instanceof Step step) {
if (!states.containsKey(input)) {
- Step step = (Step) input;
- states.put(input, new StepState(prefix + "step" + (stepCounter++), step));
+ states.put(input, new StepState(prefix + "step" + stepCounter++, step));
}
result = states.get(input);
}
- else if (input instanceof JobExecutionDecider) {
+ else if (input instanceof JobExecutionDecider jobExecutionDecider) {
if (!states.containsKey(input)) {
- states.put(input,
- new DecisionState((JobExecutionDecider) input, prefix + "decision" + (decisionCounter++)));
+ states.put(input, new DecisionState(jobExecutionDecider, prefix + "decision" + decisionCounter++));
}
result = states.get(input);
}
- else if (input instanceof Flow) {
+ else if (input instanceof Flow f) {
if (!states.containsKey(input)) {
- states.put(input, new FlowState((Flow) input, prefix + "flow" + (flowCounter++)));
+ states.put(input, new FlowState(f, prefix + "flow" + flowCounter++));
}
result = states.get(input);
}
@@ -311,7 +309,7 @@ else if (input instanceof Flow) {
private SplitState createState(Collection flows, TaskExecutor executor, SplitState parentSplit) {
if (!states.containsKey(flows)) {
- states.put(flows, new SplitState(flows, prefix + "split" + (splitCounter++), parentSplit));
+ states.put(flows, new SplitState(flows, prefix + "split" + splitCounter++, parentSplit));
}
SplitState result = (SplitState) states.get(flows);
if (executor != null) {
@@ -392,7 +390,7 @@ protected void stop(String pattern) {
}
protected void stop(String pattern, State restart) {
- EndState next = new EndState(FlowExecutionStatus.STOPPED, "STOPPED", prefix + "stop" + (endCounter++), true);
+ EndState next = new EndState(FlowExecutionStatus.STOPPED, "STOPPED", prefix + "stop" + endCounter++, true);
addTransition(pattern, next);
currentState = next;
addTransition("*", restart);
@@ -403,7 +401,7 @@ private void end(String pattern) {
}
private void end(String pattern, String code) {
- addTransition(pattern, new EndState(FlowExecutionStatus.COMPLETED, code, prefix + "end" + (endCounter++)));
+ addTransition(pattern, new EndState(FlowExecutionStatus.COMPLETED, code, prefix + "end" + endCounter++));
}
private void fail(String pattern) {
@@ -634,11 +632,11 @@ public SplitBuilder(FlowBuilder parent, TaskExecutor executor) {
*/
public FlowBuilder add(Flow... flows) {
Collection list = new ArrayList<>(Arrays.asList(flows));
- String name = "split" + (parent.splitCounter++);
+ String name = "split" + parent.splitCounter++;
State one = parent.currentState;
- if (one instanceof SplitState) {
- parent.currentState = parent.createState(list, executor, (SplitState) one);
+ if (one instanceof SplitState splitState) {
+ parent.currentState = parent.createState(list, executor, splitState);
return parent;
}
@@ -647,8 +645,8 @@ public FlowBuilder add(Flow... flows) {
stateBuilder.currentState = one;
list.add(stateBuilder.build());
}
- else if (one instanceof FlowState && parent.states.size() == 1) {
- list.add(((FlowState) one).getFlows().iterator().next());
+ else if (one instanceof FlowState flowState && parent.states.size() == 1) {
+ list.add(flowState.getFlows().iterator().next());
}
parent.currentState = parent.createState(list, executor, null);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java
index ccb718d39f..0e75832001 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.job.builder;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowJob;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
index 6ea4823189..c42eb8e6d7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.job.builder;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.batch.core.repository.JobRepository;
@@ -31,17 +31,17 @@
public class JobBuilder extends JobBuilderHelper {
/**
- * Create a new builder for a job with the given name.
- * @param name the name of the job
- * @deprecated use {@link JobBuilder#JobBuilder(String, JobRepository)}
+ * Create a new builder for a job with the given job repository. The name of the job
+ * will be set to the bean name by default.
+ * @param jobRepository the job repository to which the job should report to.
+ * @since 6.0
*/
- @Deprecated(since = "5.0", forRemoval = true)
- public JobBuilder(String name) {
- super(name);
+ public JobBuilder(JobRepository jobRepository) {
+ super(jobRepository);
}
/**
- * Create a new builder for a job with the given name.
+ * Create a new builder for a job with the given name and job repository.
* @param name the name of the job
* @param jobRepository the job repository to which the job should report to
* @since 5.0
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
index cacf2eab6f..71468e4ba4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,9 +27,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
import org.springframework.batch.core.annotation.AfterJob;
import org.springframework.batch.core.annotation.BeforeJob;
import org.springframework.batch.core.job.AbstractJob;
@@ -56,13 +56,12 @@ public abstract class JobBuilderHelper> {
/**
* Create a new {@link JobBuilderHelper}.
- * @param name the job name
- * @deprecated use {@link JobBuilderHelper#JobBuilderHelper(String, JobRepository)}
+ * @param jobRepository the job repository
+ * @since 6.0
*/
- @Deprecated(since = "5.1", forRemoval = true)
- public JobBuilderHelper(String name) {
+ public JobBuilderHelper(JobRepository jobRepository) {
this.properties = new CommonJobProperties();
- properties.name = name;
+ properties.jobRepository = jobRepository;
}
/**
@@ -110,20 +109,6 @@ public B incrementer(JobParametersIncrementer jobParametersIncrementer) {
return result;
}
- /**
- * Sets the job repository for the job.
- * @param jobRepository the job repository (mandatory)
- * @return this to enable fluent chaining
- * @deprecated use {@link JobBuilderHelper#JobBuilderHelper(String, JobRepository)}
- */
- @Deprecated(since = "5.1", forRemoval = true)
- public B repository(JobRepository jobRepository) {
- properties.jobRepository = jobRepository;
- @SuppressWarnings("unchecked")
- B result = (B) this;
- return result;
- }
-
/**
* Sets the job observation convention.
* @param observationConvention the job observation convention (optional)
@@ -254,6 +239,8 @@ protected void enhance(AbstractJob job) {
public static class CommonJobProperties {
+ private String name;
+
private Set jobExecutionListeners = new LinkedHashSet<>();
private boolean restartable = true;
@@ -361,8 +348,6 @@ public void setRestartable(boolean restartable) {
this.restartable = restartable;
}
- private String name;
-
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java
index db456d4863..0ae824d3dc 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.job.builder;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.beans.factory.InitializingBean;
@@ -63,9 +63,9 @@ public JobFlowBuilder(FlowJobBuilder parent, Flow flow) {
public FlowJobBuilder build() {
Flow flow = flow();
- if (flow instanceof InitializingBean) {
+ if (flow instanceof InitializingBean initializingBean) {
try {
- ((InitializingBean) flow).afterPropertiesSet();
+ initializingBean.afterPropertiesSet();
}
catch (Exception e) {
throw new FlowBuilderException(e);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java
index b714d484ea..5668353f4c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java
@@ -18,8 +18,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.core.task.TaskExecutor;
@@ -156,7 +156,7 @@ public SimpleJobBuilder next(Step step) {
* @param executor instance of {@link TaskExecutor} to be used.
* @return builder for fluent chaining
*/
- public JobFlowBuilder.SplitBuilder split(TaskExecutor executor) {
+ public FlowBuilder.SplitBuilder split(TaskExecutor executor) {
for (Step step : steps) {
if (builder == null) {
builder = new JobFlowBuilder(new FlowJobBuilder(this), step);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutor.java
index 4f24417f36..9b916d749a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutor.java
@@ -15,11 +15,11 @@
*/
package org.springframework.batch.core.job.flow;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.StartLimitExceededException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
index 33e2f491fe..65e3604e85 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
@@ -19,10 +19,10 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.job.SimpleStepHandler;
import org.springframework.batch.core.step.StepHolder;
@@ -96,13 +96,13 @@ private void findSteps(Flow flow, Map map) {
map.put(name, locator.getStep(name));
}
}
- else if (state instanceof StepHolder) {
- Step step = ((StepHolder) state).getStep();
+ else if (state instanceof StepHolder stepHolder) {
+ Step step = stepHolder.getStep();
String name = step.getName();
stepMap.put(name, step);
}
- else if (state instanceof FlowHolder) {
- for (Flow subflow : ((FlowHolder) state).getFlows()) {
+ else if (state instanceof FlowHolder flowHolder) {
+ for (Flow subflow : flowHolder.getFlows()) {
findSteps(subflow, map);
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java
index de1ca1b5c0..c4e799c5a7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.job.flow;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.SimpleStepHandler;
import org.springframework.batch.core.job.StepHandler;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java
index 9ccad19835..34db827b1d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.job.flow;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
index c1583e25f1..e72278f638 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
@@ -18,11 +18,11 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.StartLimitExceededException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.StepHandler;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.JobRestartException;
@@ -40,7 +40,7 @@
*/
public class JobFlowExecutor implements FlowExecutor {
- private final ThreadLocal stepExecutionHolder = new ThreadLocal<>();
+ private static final ThreadLocal stepExecutionHolder = new ThreadLocal<>();
private final JobExecution execution;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java
index 1818d017fd..e90f7db82a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java
@@ -29,8 +29,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowExecution;
import org.springframework.batch.core.job.flow.FlowExecutionException;
@@ -243,9 +243,8 @@ protected State nextState(String stateName, FlowExecutionStatus status, StepExec
}
protected boolean isFlowContinued(State state, FlowExecutionStatus status, StepExecution stepExecution) {
- boolean continued = true;
- continued = state != null && status != FlowExecutionStatus.STOPPED;
+ boolean continued = state != null && status != FlowExecutionStatus.STOPPED;
if (stepExecution != null) {
Boolean reRun = (Boolean) stepExecution.getExecutionContext().get("batch.restart");
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java
index c6528b03d0..f628c11878 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java
@@ -17,7 +17,7 @@
package org.springframework.batch.core.job.flow.support.state;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.FlowExecutor;
import org.springframework.batch.core.job.flow.State;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java
index 14f256adc8..8bedef1114 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java
@@ -129,8 +129,8 @@ public FlowExecutionStatus handle(final FlowExecutor executor) throws Exception
catch (ExecutionException e) {
// Unwrap the expected exceptions
Throwable cause = e.getCause();
- if (cause instanceof Exception) {
- exceptions.add((Exception) cause);
+ if (cause instanceof Exception exception) {
+ exceptions.add(exception);
}
else {
exceptions.add(e);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java
index 73d20b4193..ec38ae382a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java
@@ -20,7 +20,7 @@
import java.util.Collection;
import java.util.List;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.FlowExecutor;
import org.springframework.batch.core.job.flow.State;
@@ -84,8 +84,8 @@ public Collection getStepNames() {
names.add(step.getName());
- if (step instanceof StepLocator) {
- names.addAll(((StepLocator) step).getStepNames());
+ if (step instanceof StepLocator stepLocator) {
+ names.addAll(stepLocator.getStepNames());
}
return names;
@@ -98,8 +98,8 @@ public Step getStep(String stepName) throws NoSuchStepException {
if (step.getName().equals(stepName)) {
result = step;
}
- else if (step instanceof StepLocator) {
- result = ((StepLocator) step).getStep(stepName);
+ else if (step instanceof StepLocator stepLocator) {
+ result = stepLocator.getStep(stepName);
}
return result;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/CompositeJobParametersValidator.java
similarity index 90%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/CompositeJobParametersValidator.java
index 8ed88989d9..743afa4d85 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/CompositeJobParametersValidator.java
@@ -13,13 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.job;
+package org.springframework.batch.core.job.parameters;
import java.util.List;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/DefaultJobParametersValidator.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/DefaultJobParametersValidator.java
index 114670c294..836cc74803 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/DefaultJobParametersValidator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.job;
+package org.springframework.batch.core.job.parameters;
import java.util.Arrays;
import java.util.Collection;
@@ -23,9 +23,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameter.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameter.java
index cd9853a5aa..7c02f48b5c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
import java.io.Serializable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameters.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameters.java
index a5e54b0c65..b4de56936f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameters.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
import java.io.Serializable;
import java.time.LocalDate;
@@ -373,7 +373,7 @@ public String toString() {
for (Map.Entry> entry : this.parameters.entrySet()) {
parameters.add(String.format("'%s':'%s'", entry.getKey(), entry.getValue()));
}
- return new StringBuilder("{").append(String.join(",", parameters)).append("}").toString();
+ return "{" + String.join(",", parameters) + "}";
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersBuilder.java
similarity index 78%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersBuilder.java
index a12ad7bc67..7bebeedcd9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -23,7 +23,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobInstance;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
@@ -49,8 +49,6 @@ public class JobParametersBuilder {
private Map> parameterMap;
- private JobExplorer jobExplorer;
-
/**
* Default constructor. Initializes the builder with empty parameters.
*/
@@ -58,31 +56,11 @@ public JobParametersBuilder() {
this.parameterMap = new HashMap<>();
}
- /**
- * @param jobExplorer {@link JobExplorer} used for looking up previous job parameter
- * information.
- */
- public JobParametersBuilder(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
- this.parameterMap = new HashMap<>();
- }
-
/**
* Copy constructor. Initializes the builder with the supplied parameters.
* @param jobParameters {@link JobParameters} instance used to initialize the builder.
*/
public JobParametersBuilder(JobParameters jobParameters) {
- this(jobParameters, null);
- }
-
- /**
- * Copy constructor. Initializes the builder with the supplied parameters.
- * @param jobParameters {@link JobParameters} instance used to initialize the builder.
- * @param jobExplorer {@link JobExplorer} used for looking up previous job parameter
- * information.
- */
- public JobParametersBuilder(JobParameters jobParameters, JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
this.parameterMap = new HashMap<>(jobParameters.getParameters());
}
@@ -316,51 +294,4 @@ public JobParametersBuilder addJobParameters(JobParameters jobParameters) {
return this;
}
- /**
- * Initializes the {@link JobParameters} based on the state of the {@link Job}. This
- * should be called after all parameters have been entered into the builder. All
- * parameters already set on this builder instance are appended to those retrieved
- * from the job incrementer, overriding any with the same key (this is the same
- * behavior as
- * {@link org.springframework.batch.core.launch.support.CommandLineJobRunner} with the
- * {@code -next} option and
- * {@link org.springframework.batch.core.launch.JobOperator#startNextInstance(String)}).
- * @param job The job for which the {@link JobParameters} are being constructed.
- * @return a reference to this object.
- *
- * @since 4.0
- */
- public JobParametersBuilder getNextJobParameters(Job job) {
- Assert.state(this.jobExplorer != null, "A JobExplorer is required to get next job parameters");
- Assert.notNull(job, "Job must not be null");
- Assert.notNull(job.getJobParametersIncrementer(),
- "No job parameters incrementer found for job=" + job.getName());
-
- String name = job.getName();
- JobParameters nextParameters;
- JobInstance lastInstance = this.jobExplorer.getLastJobInstance(name);
- JobParametersIncrementer incrementer = job.getJobParametersIncrementer();
- if (lastInstance == null) {
- // Start from a completely clean sheet
- nextParameters = incrementer.getNext(new JobParameters());
- }
- else {
- JobExecution previousExecution = this.jobExplorer.getLastJobExecution(lastInstance);
- if (previousExecution == null) {
- // Normally this will not happen - an instance exists with no executions
- nextParameters = incrementer.getNext(new JobParameters());
- }
- else {
- nextParameters = incrementer.getNext(previousExecution.getJobParameters());
- }
- }
-
- // start with parameters from the incrementer
- Map> nextParametersMap = new HashMap<>(nextParameters.getParameters());
- // append new parameters (overriding those with the same key)
- nextParametersMap.putAll(this.parameterMap);
- this.parameterMap = nextParametersMap;
- return this;
- }
-
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersIncrementer.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersIncrementer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersIncrementer.java
index 86d94dc52a..61caebe6a2 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersIncrementer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersIncrementer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersInvalidException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersInvalidException.java
similarity index 86%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersInvalidException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersInvalidException.java
index c769bda7c6..2e9b2a139e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersInvalidException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersInvalidException.java
@@ -13,7 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
+
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Exception for {@link Job} to signal that some {@link JobParameters} are invalid.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersValidator.java
similarity index 92%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersValidator.java
index 15e691bc34..c794e2b385 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersValidator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersValidator.java
@@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
+import org.springframework.batch.core.job.Job;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotFailedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotFailedException.java
index b76206d945..688dfc7eb5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotFailedException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotFailedException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception to indicate that user asked for a job execution to be resumed when
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotRunningException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotRunningException.java
index d376735ee9..ac588eca01 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotRunningException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotRunningException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception indicating that a JobExecution that is not currently running has been
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotStoppedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotStoppedException.java
index 11567df815..9fa0ab46f8 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotStoppedException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotStoppedException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception to indicate that user asked for a job execution to be aborted when
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsException.java
index f99bc19725..748f94af2c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsException.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception to indicate that a required {@link Job} is not available.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java
index 79afede5ce..20f3eaf4d8 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java
@@ -15,10 +15,10 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
@@ -34,8 +34,11 @@
* @author Dave Syer
* @author Taeik Lim
* @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 in favor of {@link JobOperator}. Scheduled for removal in 6.2 or
+ * later.
*/
@FunctionalInterface
+@Deprecated(since = "6.0", forRemoval = true)
public interface JobLauncher {
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobOperator.java
index a56947412b..1153dc6541 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobOperator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobOperator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,86 +20,39 @@
import java.util.Properties;
import java.util.Set;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
+import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.lang.Nullable;
/**
- * Low level interface for inspecting and controlling jobs with access only to primitive
- * and collection types. Suitable for a command-line client (e.g. that launches a new
- * process for each operation), or a remote launcher like a JMX console.
+ * High level interface for operating batch jobs.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.0
*/
-public interface JobOperator {
+@SuppressWarnings("removal")
+public interface JobOperator extends JobLauncher {
/**
- * List the {@link JobExecution JobExecutions} associated with a particular
- * {@link JobInstance}, in reverse order of creation (and therefore usually of
- * execution).
- * @param instanceId the id of a {@link JobInstance}
- * @return the id values of all the {@link JobExecution JobExecutions} associated with
- * this instance
- * @throws NoSuchJobInstanceException if the {@link JobInstance} associated with the
- * {@code instanceId} cannot be found.
- */
- List getExecutions(long instanceId) throws NoSuchJobInstanceException;
-
- /**
- * List the {@link JobInstance JobInstances} for a given job name, in reverse order of
- * creation (and therefore usually of first execution).
- * @param jobName the job name that all the instances have
- * @param start the start index of the instances
- * @param count the maximum number of values to return
- * @return the id values of the {@link JobInstance JobInstances}
- * @throws NoSuchJobException is thrown if no {@link JobInstance}s for the jobName
- * exist.
- */
- List getJobInstances(String jobName, int start, int count) throws NoSuchJobException;
-
- /**
- * @param jobName {@link String} name of the job.
- * @param jobParameters {@link JobParameters} parameters for the job instance.
- * @return the {@link JobInstance} with the given name and parameters, or
- * {@code null}.
- *
- * @since 5.0
- */
- @Nullable
- default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Get the id values of all the running {@link JobExecution JobExecutions} with the
- * given job name.
- * @param jobName the name of the job to search under
- * @return the id values of the running {@link JobExecution} instances
- * @throws NoSuchJobException if there are no {@link JobExecution JobExecutions} with
- * that job name
- */
- Set getRunningExecutions(String jobName) throws NoSuchJobException;
-
- /**
- * Get the {@link JobParameters} as a human readable String (new line separated
- * key=value pairs).
- * @param executionId the id of an existing {@link JobExecution}
- * @return the job parameters that were used to launch the associated instance
- * @throws NoSuchJobExecutionException if the id was not associated with any
- * {@link JobExecution}
+ * List the available job names that can be launched with
+ * {@link #start(String, Properties)}.
+ * @return a set of job names
+ * @deprecated since 6.0 in favor of {@link JobRegistry#getJobNames()}. Scheduled for
+ * removal in 6.2 or later.
*/
- String getParameters(long executionId) throws NoSuchJobExecutionException;
+ @Deprecated(since = "6.0", forRemoval = true)
+ Set getJobNames();
/**
* Start a new instance of a job with the parameters specified.
@@ -111,12 +64,38 @@ default JobInstance getJobInstance(String jobName, JobParameters jobParameters)
* parameters already exists
* @throws JobParametersInvalidException thrown if any of the job parameters are
* invalid.
+ * @deprecated since 6.0 in favor of {@link #start(Job, JobParameters)}. Scheduled for
+ * removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
default Long start(String jobName, Properties parameters)
throws NoSuchJobException, JobInstanceAlreadyExistsException, JobParametersInvalidException {
throw new UnsupportedOperationException();
}
+ /**
+ * Start a new instance of a job with the specified parameters. If the job defines a
+ * {@link JobParametersIncrementer}, then the incrementer will be used to calculate
+ * the next parameters in the sequence and the provided parameters will be ignored.
+ * @param job the {@link Job} to start
+ * @param jobParameters the {@link JobParameters} to start the job with
+ * @return the {@link JobExecution} that was started
+ * @throws NoSuchJobException if the given {@link Job} is not registered
+ * @throws JobParametersInvalidException thrown if any of the job parameters are
+ * @throws JobExecutionAlreadyRunningException if the JobInstance identified by the
+ * properties already has an execution running. invalid.
+ * @throws JobRestartException if the execution would be a re-start, but a re-start is
+ * either not allowed or not needed.
+ * @throws JobInstanceAlreadyCompleteException if the job has been run before with the
+ * same parameters and completed successfully
+ * @throws IllegalArgumentException if the job or job parameters are null.
+ */
+ default JobExecution start(Job job, JobParameters jobParameters)
+ throws NoSuchJobException, JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException,
+ JobRestartException, JobParametersInvalidException {
+ throw new UnsupportedOperationException();
+ }
+
/**
* Restart a failed or stopped {@link JobExecution}. Fails with an exception if the id
* provided does not exist or corresponds to a {@link JobInstance} that in normal
@@ -132,10 +111,32 @@ default Long start(String jobName, Properties parameters)
* @throws JobRestartException if there is a non-specific error with the restart (e.g.
* corrupt or inconsistent restart data)
* @throws JobParametersInvalidException if the parameters are not valid for this job
+ * @deprecated since 6.0 in favor of {@link #restart(JobExecution)}. Scheduled for
+ * removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
Long restart(long executionId) throws JobInstanceAlreadyCompleteException, NoSuchJobExecutionException,
NoSuchJobException, JobRestartException, JobParametersInvalidException;
+ /**
+ * Restart a failed or stopped {@link JobExecution}. Fails with an exception if the
+ * execution provided does not exist or corresponds to a {@link JobInstance} that in
+ * normal circumstances already completed successfully.
+ * @param jobExecution the failed or stopped {@link JobExecution} to restart
+ * @return the {@link JobExecution} that was started
+ * @throws JobInstanceAlreadyCompleteException if the job was already successfully
+ * completed
+ * @throws NoSuchJobExecutionException if the id was not associated with any
+ * {@link JobExecution}
+ * @throws NoSuchJobException if the {@link JobExecution} was found, but its
+ * corresponding {@link Job} is no longer available for launching
+ * @throws JobRestartException if there is a non-specific error with the restart (e.g.
+ * corrupt or inconsistent restart data)
+ * @throws JobParametersInvalidException if the parameters are not valid for this job
+ */
+ JobExecution restart(JobExecution jobExecution) throws JobInstanceAlreadyCompleteException,
+ NoSuchJobExecutionException, NoSuchJobException, JobRestartException, JobParametersInvalidException;
+
/**
* Launch the next in a sequence of {@link JobInstance} determined by the
* {@link JobParametersIncrementer} attached to the specified job. If the previous
@@ -160,11 +161,37 @@ Long restart(long executionId) throws JobInstanceAlreadyCompleteException, NoSuc
* that is already executing.
* @throws JobInstanceAlreadyCompleteException thrown if attempting to restart a
* completed job.
+ * @deprecated since 6.0 in favor of {@link #startNextInstance(Job)}. Scheduled for
+ * removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
Long startNextInstance(String jobName) throws NoSuchJobException, JobParametersNotFoundException,
JobRestartException, JobExecutionAlreadyRunningException, JobInstanceAlreadyCompleteException,
UnexpectedJobExecutionException, JobParametersInvalidException;
+ /**
+ * Launch the next in a sequence of {@link JobInstance} determined by the
+ * {@link JobParametersIncrementer} attached to the specified job. If the previous
+ * instance is still in a failed state, this method should still create a new instance
+ * and run it with different parameters (as long as the
+ * {@link JobParametersIncrementer} is working).
+ *
+ *
+ * The last three exception described below should be extremely unlikely, but cannot
+ * be ruled out entirely. It points to some other thread or process trying to use this
+ * method (or a similar one) at the same time.
+ * @param job the job to launch
+ * @return the {@link JobExecution} created when the job is launched
+ * @throws UnexpectedJobExecutionException if an unexpected condition arises
+ * @throws JobRestartException thrown if a job is restarted illegally.
+ * @throws JobExecutionAlreadyRunningException thrown if attempting to restart a job
+ * that is already executing.
+ * @throws JobInstanceAlreadyCompleteException thrown if attempting to restart a
+ * completed job.
+ */
+ JobExecution startNextInstance(Job job) throws JobRestartException, JobExecutionAlreadyRunningException,
+ JobInstanceAlreadyCompleteException, UnexpectedJobExecutionException;
+
/**
* Send a stop signal to the {@link JobExecution} with the supplied id. The signal is
* successfully sent if this method returns true, but that doesn't mean that the job
@@ -176,9 +203,126 @@ Long startNextInstance(String jobName) throws NoSuchJobException, JobParametersN
* supplied
* @throws JobExecutionNotRunningException if the {@link JobExecution} is not running
* (so cannot be stopped)
+ * @deprecated since 6.0 in favor of {@link #stop(JobExecution)}. Scheduled for
+ * removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
boolean stop(long executionId) throws NoSuchJobExecutionException, JobExecutionNotRunningException;
+ /**
+ * Send a stop signal to the supplied {@link JobExecution}. The signal is successfully
+ * sent if this method returns true, but that doesn't mean that the job has stopped.
+ * The only way to be sure of that is to poll the job execution status.
+ * @param jobExecution the running {@link JobExecution}
+ * @return true if the message was successfully sent (does not guarantee that the job
+ * has stopped)
+ * @throws JobExecutionNotRunningException if the supplied {@link JobExecution} is not
+ * running (so cannot be stopped)
+ */
+ boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningException;
+
+ /**
+ * Mark the {@link JobExecution} as ABANDONED. If a stop signal is ignored because the
+ * process died this is the best way to mark a job as finished with (as opposed to
+ * STOPPED). An abandoned job execution cannot be restarted by the framework.
+ * @param jobExecutionId the job execution id to abort
+ * @return the {@link JobExecution} that was aborted
+ * @throws NoSuchJobExecutionException thrown if there is no job execution for the
+ * jobExecutionId.
+ * @throws JobExecutionAlreadyRunningException if the job is running (it should be
+ * stopped first)
+ * @deprecated since 6.0 in favor of {@link #abandon(JobExecution)}. Scheduled for
+ * removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ JobExecution abandon(long jobExecutionId) throws NoSuchJobExecutionException, JobExecutionAlreadyRunningException;
+
+ /**
+ * Mark the {@link JobExecution} as ABANDONED. If a stop signal is ignored because the
+ * process died this is the best way to mark a job as finished with (as opposed to
+ * STOPPED). An abandoned job execution cannot be restarted by the framework.
+ * @param jobExecution the job execution to abort
+ * @return the {@link JobExecution} that was aborted
+ * @throws JobExecutionAlreadyRunningException if the job execution is running (it
+ * should be stopped first)
+ */
+ JobExecution abandon(JobExecution jobExecution) throws JobExecutionAlreadyRunningException;
+
+ /**
+ * List the {@link JobExecution JobExecutions} associated with a particular
+ * {@link JobInstance}, in reverse order of creation (and therefore usually of
+ * execution).
+ * @param instanceId the id of a {@link JobInstance}
+ * @return the id values of all the {@link JobExecution JobExecutions} associated with
+ * this instance
+ * @throws NoSuchJobInstanceException if the {@link JobInstance} associated with the
+ * {@code instanceId} cannot be found.
+ * @deprecated Since 6.0 in favor of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobExecutions(JobInstance)}.
+ * Scheduled for removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ List getExecutions(long instanceId) throws NoSuchJobInstanceException;
+
+ /**
+ * List the {@link JobInstance JobInstances} for a given job name, in reverse order of
+ * creation (and therefore usually of first execution).
+ * @param jobName the job name that all the instances have
+ * @param start the start index of the instances
+ * @param count the maximum number of values to return
+ * @return the id values of the {@link JobInstance JobInstances}
+ * @throws NoSuchJobException is thrown if no {@link JobInstance}s for the jobName
+ * exist.
+ * @deprecated Since 6.0 in favor of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobInstances(String, int, int)}.
+ * Scheduled for removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ List getJobInstances(String jobName, int start, int count) throws NoSuchJobException;
+
+ /**
+ * @param jobName {@link String} name of the job.
+ * @param jobParameters {@link JobParameters} parameters for the job instance.
+ * @return the {@link JobInstance} with the given name and parameters, or
+ * {@code null}.
+ * @deprecated Since 6.0 in favor of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobInstance(String, JobParameters)}.
+ * Scheduled for removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ @Nullable
+ default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Get the id values of all the running {@link JobExecution JobExecutions} with the
+ * given job name.
+ * @param jobName the name of the job to search under
+ * @return the id values of the running {@link JobExecution} instances
+ * @throws NoSuchJobException if there are no {@link JobExecution JobExecutions} with
+ * that job name
+ * @deprecated Since 6.0 in favor of
+ * {@link org.springframework.batch.core.repository.JobRepository#findRunningJobExecutions(String)}.
+ * Scheduled for removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ Set getRunningExecutions(String jobName) throws NoSuchJobException;
+
+ /**
+ * Get the {@link JobParameters} as a human readable String (new line separated
+ * key=value pairs).
+ * @param executionId the id of an existing {@link JobExecution}
+ * @return the job parameters that were used to launch the associated instance
+ * @throws NoSuchJobExecutionException if the id was not associated with any
+ * {@link JobExecution}
+ * @deprecated Since 6.0 in favor of the getJobParameters() method of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobExecution(Long)}.
+ * Scheduled for removal in 6.2 or later.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ String getParameters(long executionId) throws NoSuchJobExecutionException;
+
/**
* Summarise the {@link JobExecution} with the supplied id, giving details of status,
* start and end times etc.
@@ -186,7 +330,11 @@ Long startNextInstance(String jobName) throws NoSuchJobException, JobParametersN
* @return a String summarising the state of the job execution
* @throws NoSuchJobExecutionException if there is no {@link JobExecution} with the
* supplied id
+ * @deprecated Since 6.0 in favor of the toString() method of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobExecution(Long)}.
+ * Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
String getSummary(long executionId) throws NoSuchJobExecutionException;
/**
@@ -196,27 +344,11 @@ Long startNextInstance(String jobName) throws NoSuchJobException, JobParametersN
* @return a map of step execution id to String summarising the state of the execution
* @throws NoSuchJobExecutionException if there is no {@link JobExecution} with the
* supplied id
+ * @deprecated Since 6.0 in favor of the getStepExecutions() method of
+ * {@link org.springframework.batch.core.repository.JobRepository#getJobExecution(Long)}.
+ * Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
Map getStepExecutionSummaries(long executionId) throws NoSuchJobExecutionException;
- /**
- * List the available job names that can be launched with
- * {@link #start(String, Properties)}.
- * @return a set of job names
- */
- Set getJobNames();
-
- /**
- * Mark the {@link JobExecution} as ABANDONED. If a stop signal is ignored because the
- * process died this is the best way to mark a job as finished with (as opposed to
- * STOPPED). An abandoned job execution cannot be restarted by the framework.
- * @param jobExecutionId the job execution id to abort
- * @return the {@link JobExecution} that was aborted
- * @throws NoSuchJobExecutionException thrown if there is no job execution for the
- * jobExecutionId.
- * @throws JobExecutionAlreadyRunningException if the job is running (it should be
- * stopped first)
- */
- JobExecution abandon(long jobExecutionId) throws NoSuchJobExecutionException, JobExecutionAlreadyRunningException;
-
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobParametersNotFoundException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobParametersNotFoundException.java
index 8ff1f36633..cc2db0986c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobParametersNotFoundException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobParametersNotFoundException.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
/**
* Checked exception to indicate that a required {@link JobParametersIncrementer} is not
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobException.java
index 8131ecfa6a..d7d053a660 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobException.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception to indicate that a required {@link Job} is not available.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobExecutionException.java
index 7135d5cfe9..13f17c7bbf 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobExecutionException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobExecutionException.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Checked exception to indicate that a required {@link JobExecution} is not available.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobInstanceException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobInstanceException.java
index 1f6a48c9fc..29d4a4ba07 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobInstanceException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobInstanceException.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.launch;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.JobInstance;
/**
* Exception that signals that the user requested an operation on a non-existent
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobOperator.java
new file mode 100644
index 0000000000..4c0810efce
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobOperator.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.launch.support;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.converter.DefaultJobParametersConverter;
+import org.springframework.batch.core.converter.JobParametersConverter;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.log.LogAccessor;
+
+import static org.springframework.batch.core.launch.support.ExitCodeMapper.JVM_EXITCODE_COMPLETED;
+import static org.springframework.batch.core.launch.support.ExitCodeMapper.JVM_EXITCODE_GENERIC_ERROR;
+
+/**
+ * A command-line utility to operate Spring Batch jobs using the {@link JobOperator}. It
+ * allows starting, stopping, restarting, and abandoning jobs from the command line.
+ *
+ * This utility requires a Spring application context to be set up with the necessary
+ * batch infrastructure, including a {@link JobOperator}, a {@link JobRepository}, and a
+ * {@link JobRegistry} populated with the jobs to operate. It can also be configured with
+ * a custom {@link ExitCodeMapper} and a {@link JobParametersConverter}.
+ *
+ *
+ * This class is designed to be run from the command line, and the Javadoc of the
+ * {@link #main(String[])} method explains the various operations and exit codes.
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ */
+public class CommandLineJobOperator {
+
+ private static final LogAccessor logger = new LogAccessor(CommandLineJobOperator.class);
+
+ private final JobOperator jobOperator;
+
+ private final JobRepository jobRepository;
+
+ private final JobRegistry jobRegistry;
+
+ private ExitCodeMapper exitCodeMapper = new SimpleJvmExitCodeMapper();
+
+ private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();
+
+ /**
+ * Create a new {@link CommandLineJobOperator} instance.
+ * @param jobOperator the {@link JobOperator} to use for job operations
+ * @param jobRepository the {@link JobRepository} to use for job meta-data management
+ * @param jobRegistry the {@link JobRegistry} to use for job lookup by name
+ */
+ public CommandLineJobOperator(JobOperator jobOperator, JobRepository jobRepository, JobRegistry jobRegistry) {
+ this.jobOperator = jobOperator;
+ this.jobRepository = jobRepository;
+ this.jobRegistry = jobRegistry;
+ }
+
+ /**
+ * Set the {@link JobParametersConverter} to use for converting command line
+ * parameters to {@link JobParameters}. Defaults to a
+ * {@link DefaultJobParametersConverter}.
+ * @param jobParametersConverter the job parameters converter to set
+ */
+ public void setJobParametersConverter(JobParametersConverter jobParametersConverter) {
+ this.jobParametersConverter = jobParametersConverter;
+ }
+
+ /**
+ * Set the {@link ExitCodeMapper} to use for converting job exit codes to JVM exit
+ * codes. Defaults to a {@link SimpleJvmExitCodeMapper}.
+ * @param exitCodeMapper the exit code mapper to set
+ */
+ public void setExitCodeMapper(ExitCodeMapper exitCodeMapper) {
+ this.exitCodeMapper = exitCodeMapper;
+ }
+
+ /**
+ * Start a job with the given name and parameters.
+ * @param jobName the name of the job to start
+ * @param parameters the parameters for the job
+ * @return the exit code of the job execution, or JVM_EXITCODE_GENERIC_ERROR if an
+ * error occurs
+ */
+ public int start(String jobName, Properties parameters) {
+ logger.info(() -> "Starting job with name '" + jobName + "' and parameters: " + parameters);
+ try {
+ Job job = this.jobRegistry.getJob(jobName);
+ JobParameters jobParameters = this.jobParametersConverter.getJobParameters(parameters);
+ JobExecution jobExecution = this.jobOperator.start(job, jobParameters);
+ return this.exitCodeMapper.intValue(jobExecution.getExitStatus().getExitCode());
+ }
+ catch (Exception e) {
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ }
+
+ /**
+ * Start the next instance of the job with the given name.
+ * @param jobName the name of the job to start
+ * @return the exit code of the job execution, or JVM_EXITCODE_GENERIC_ERROR if an
+ * error occurs
+ */
+ public int startNextInstance(String jobName) {
+ logger.info(() -> "Starting next instance of job '" + jobName + "'");
+ try {
+ Job job = this.jobRegistry.getJob(jobName);
+ JobExecution jobExecution = this.jobOperator.startNextInstance(job);
+ return this.exitCodeMapper.intValue(jobExecution.getExitStatus().getExitCode());
+ }
+ catch (Exception e) {
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ }
+
+ /**
+ * Send a stop signal to the job execution with given ID. The signal is successfully
+ * sent if this method returns JVM_EXITCODE_COMPLETED, but that doesn't mean that the
+ * job has stopped. The only way to be sure of that is to poll the job execution
+ * status.
+ * @param jobExecutionId the ID of the job execution to stop
+ * @return JVM_EXITCODE_COMPLETED if the stop signal was successfully sent to the job
+ * execution, JVM_EXITCODE_GENERIC_ERROR otherwise
+ * @see JobOperator#stop(JobExecution)
+ */
+ public int stop(long jobExecutionId) {
+ logger.info(() -> "Stopping job execution with ID: " + jobExecutionId);
+ try {
+ JobExecution jobExecution = this.jobRepository.getJobExecution(jobExecutionId);
+ if (jobExecution == null) {
+ logger.error(() -> "No job execution found with ID: " + jobExecutionId);
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ boolean stopSignalSent = this.jobOperator.stop(jobExecution);
+ return stopSignalSent ? JVM_EXITCODE_COMPLETED : JVM_EXITCODE_GENERIC_ERROR;
+ }
+ catch (Exception e) {
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ }
+
+ /**
+ * Restart the job execution with the given ID.
+ * @param jobExecutionId the ID of the job execution to restart
+ * @return the exit code of the restarted job execution, or JVM_EXITCODE_GENERIC_ERROR
+ * if an error occurs
+ */
+ public int restart(long jobExecutionId) {
+ logger.info(() -> "Restarting job execution with ID: " + jobExecutionId);
+ try {
+ JobExecution jobExecution = this.jobRepository.getJobExecution(jobExecutionId);
+ if (jobExecution == null) {
+ logger.error(() -> "No job execution found with ID: " + jobExecutionId);
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ JobExecution restartedExecution = this.jobOperator.restart(jobExecution);
+ return this.exitCodeMapper.intValue(restartedExecution.getExitStatus().getExitCode());
+ }
+ catch (Exception e) {
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ }
+
+ /**
+ * Abandon the job execution with the given ID.
+ * @param jobExecutionId the ID of the job execution to abandon
+ * @return the exit code of the abandoned job execution, or JVM_EXITCODE_GENERIC_ERROR
+ * if an error occurs
+ */
+ public int abandon(long jobExecutionId) {
+ logger.info(() -> "Abandoning job execution with ID: " + jobExecutionId);
+ try {
+ JobExecution jobExecution = this.jobRepository.getJobExecution(jobExecutionId);
+ if (jobExecution == null) {
+ logger.error(() -> "No job execution found with ID: " + jobExecutionId);
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ JobExecution abandonedExecution = this.jobOperator.abandon(jobExecution);
+ return this.exitCodeMapper.intValue(abandonedExecution.getExitStatus().getExitCode());
+ }
+ catch (Exception e) {
+ return JVM_EXITCODE_GENERIC_ERROR;
+ }
+ }
+
+ /*
+ * Main method to operate jobs from the command line.
+ *
+ * Usage: java org.springframework.batch.core.launch.support.CommandLineJobOperator \
+ * fully.qualified.name.of.JobConfigurationClass \ operation \ parameters \
+ *
+ * where operation is one of the following: - start jobName [jobParameters] -
+ * startNextInstance jobName - restart jobExecutionId - stop jobExecutionId - abandon
+ * jobExecutionId
+ *
+ * and jobParameters are key-value pairs in the form name=value,type,identifying.
+ *
+ * Exit status: - 0: Job completed successfully - 1: Job failed to (re)start or an
+ * error occurred - 2: Job configuration class not found
+ */
+ public static void main(String[] args) {
+ if (args.length < 3) {
+ String usage = """
+ Usage: java %s
+ where operation is one of the following:
+ - start jobName [jobParameters]
+ - startNextInstance jobName
+ - restart jobExecutionId
+ - stop jobExecutionId
+ - abandon jobExecutionId
+ and jobParameters are key-value pairs in the form name=value,type,identifying.
+ """;
+ System.err.printf(String.format(usage, CommandLineJobOperator.class.getName()));
+ System.exit(1);
+ }
+
+ String jobConfigurationClassName = args[0];
+ String operation = args[1];
+
+ ConfigurableApplicationContext context = null;
+ try {
+ Class jobConfigurationClass = Class.forName(jobConfigurationClassName);
+ context = new AnnotationConfigApplicationContext(jobConfigurationClass);
+ }
+ catch (ClassNotFoundException classNotFoundException) {
+ System.err.println("Job configuration class not found: " + jobConfigurationClassName);
+ System.exit(2);
+ }
+
+ JobOperator jobOperator = null;
+ JobRepository jobRepository = null;
+ JobRegistry jobRegistry = null;
+ try {
+ jobOperator = context.getBean(JobOperator.class);
+ jobRepository = context.getBean(JobRepository.class);
+ jobRegistry = context.getBean(JobRegistry.class);
+ }
+ catch (BeansException e) {
+ System.err.println("A required bean was not found in the application context: " + e.getMessage());
+ System.exit(1);
+ }
+ CommandLineJobOperator operator = new CommandLineJobOperator(jobOperator, jobRepository, jobRegistry);
+
+ int exitCode;
+ String jobName;
+ long jobExecutionId;
+ switch (operation) {
+ case "start":
+ jobName = args[2];
+ List jobParameters = Arrays.asList(args).subList(3, args.length);
+ exitCode = operator.start(jobName, parse(jobParameters));
+ break;
+ case "startNextInstance":
+ jobName = args[2];
+ exitCode = operator.startNextInstance(jobName);
+ break;
+ case "stop":
+ jobExecutionId = Long.parseLong(args[2]);
+ exitCode = operator.stop(jobExecutionId);
+ break;
+ case "restart":
+ jobExecutionId = Long.parseLong(args[2]);
+ exitCode = operator.restart(jobExecutionId);
+ break;
+ case "abandon":
+ jobExecutionId = Long.parseLong(args[2]);
+ exitCode = operator.abandon(jobExecutionId);
+ break;
+ default:
+ System.err.println("Unknown operation: " + operation);
+ exitCode = JVM_EXITCODE_GENERIC_ERROR;
+ }
+
+ System.exit(exitCode);
+ }
+
+ private static Properties parse(List jobParameters) {
+ Properties properties = new Properties();
+ for (String jobParameter : jobParameters) {
+ String[] tokens = jobParameter.split("=");
+ properties.put(tokens[0], tokens[1]);
+ }
+ return properties;
+ }
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
index 34bdf928b0..d4071ba3cb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -31,21 +31,17 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
import org.springframework.batch.core.configuration.JobLocator;
+import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobExecutionNotFailedException;
-import org.springframework.batch.core.launch.JobExecutionNotRunningException;
-import org.springframework.batch.core.launch.JobExecutionNotStoppedException;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.launch.*;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -74,7 +70,7 @@
* can be used to load the job and its context from a single location. All dependencies of
* the launcher will then be satisfied by autowiring by type from the combined application
* context. Default values are provided for all fields except the {@link JobLauncher} and
- * {@link JobLocator} . Therefore, if autowiring fails to set it (it should be noted that
+ * {@link JobRegistry} . Therefore, if autowiring fails to set it (it should be noted that
* dependency checking is disabled because most of the fields have default values and thus
* don't require dependencies to be fulfilled via autowiring) then an exception will be
* thrown. It should also be noted that even if an exception is thrown by this class, it
@@ -163,8 +159,8 @@
* {@link BeanDefinitionStoreException} will be thrown. The same exception will also be
* thrown if there is more than one present. Assuming the JobLauncher has been set
* correctly, the jobIdentifier argument will be used to obtain an actual {@link Job}. If
- * a {@link JobLocator} has been set, then it will be used, if not the beanFactory will be
- * asked, using the jobIdentifier as the bean id.
+ * a {@link JobRegistry} has been set, then it will be used, if not the beanFactory will
+ * be asked, using the jobIdentifier as the bean id.
*
*
* @author Dave Syer
@@ -172,7 +168,10 @@
* @author Mahmoud Ben Hassine
* @author Minsoo Kim
* @since 1.0
+ * @deprecated since 6.0 in favor of {@link CommandLineJobOperator}. Scheduled for removal
+ * in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class CommandLineJobRunner {
protected static final Log logger = LogFactory.getLog(CommandLineJobRunner.class);
@@ -183,6 +182,8 @@ public class CommandLineJobRunner {
private JobLocator jobLocator;
+ private JobRegistry jobRegistry;
+
private static SystemExiter systemExiter = new JvmSystemExiter();
private static String message = "";
@@ -274,11 +275,22 @@ public void exit(int status) {
/**
* {@link JobLocator} to find a job to run.
* @param jobLocator a {@link JobLocator}
+ * @deprecated since 6.0 in favor of {{@link #setJobRegistry(JobRegistry)}}. Scheduled
+ * for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public void setJobLocator(JobLocator jobLocator) {
this.jobLocator = jobLocator;
}
+ /**
+ * Set the {@link JobRegistry}.
+ * @param jobRegistry a {@link JobRegistry}
+ */
+ public void setJobRegistry(JobRegistry jobRegistry) {
+ this.jobRegistry = jobRegistry;
+ }
+
/*
* Start a job by obtaining a combined classpath using the job launcher and job paths.
* If a JobLocator has been set, then use it to obtain an actual job, if not ask the
@@ -348,20 +360,35 @@ int start(String jobPath, String jobIdentifier, String[] parameters, Set
}
Job job = null;
- if (jobLocator != null) {
+ if (jobRegistry != null) {
try {
- job = jobLocator.getJob(jobName);
+ job = jobRegistry.getJob(jobName);
}
- catch (NoSuchJobException e) {
+ catch (NoSuchJobException ignored) {
}
}
if (job == null) {
- job = (Job) context.getBean(jobName);
+ job = context.getBean(jobName, Job.class);
}
if (opts.contains("-next")) {
- jobParameters = new JobParametersBuilder(jobParameters, jobExplorer).getNextJobParameters(job)
- .toJobParameters();
+ JobInstance lastInstance = jobRepository.getLastJobInstance(jobName);
+ JobParametersIncrementer incrementer = job.getJobParametersIncrementer();
+ if (lastInstance == null) {
+ // Start from a completely clean sheet
+ jobParameters = incrementer.getNext(new JobParameters());
+ }
+ else {
+ JobExecution previousExecution = jobRepository.getLastJobExecution(lastInstance);
+ if (previousExecution == null) {
+ // Normally this will not happen - an instance exists with no
+ // executions
+ jobParameters = incrementer.getNext(new JobParameters());
+ }
+ else {
+ jobParameters = incrementer.getNext(previousExecution.getJobParameters());
+ }
+ }
}
JobExecution jobExecution = launcher.run(job, jobParameters);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java
index 5cce9c53f9..759aa4400e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.launch.support;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java
index a3c07375ec..8126434a08 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -17,16 +17,20 @@
import java.util.Properties;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.task.SyncTaskExecutor;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionManager;
import org.springframework.transaction.annotation.Isolation;
@@ -41,12 +45,14 @@
* {@link JobOperator}.
*
* @see JobOperator
- * @see SimpleJobOperator
+ * @see TaskExecutorJobOperator
* @author Mahmoud Ben Hassine
* @since 5.0
*/
public class JobOperatorFactoryBean implements FactoryBean, InitializingBean {
+ protected static final Log logger = LogFactory.getLog(JobOperatorFactoryBean.class);
+
private static final String TRANSACTION_ISOLATION_LEVEL_PREFIX = "ISOLATION_";
private static final String TRANSACTION_PROPAGATION_PREFIX = "PROPAGATION_";
@@ -57,23 +63,25 @@ public class JobOperatorFactoryBean implements FactoryBean, Initial
private JobRegistry jobRegistry;
- private JobLauncher jobLauncher;
-
private JobRepository jobRepository;
- private JobExplorer jobExplorer;
-
private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();
+ private TaskExecutor taskExecutor;
+
+ private MeterRegistry meterRegistry = Metrics.globalRegistry;
+
private final ProxyFactory proxyFactory = new ProxyFactory();
@Override
public void afterPropertiesSet() throws Exception {
- Assert.notNull(this.transactionManager, "TransactionManager must not be null");
- Assert.notNull(this.jobLauncher, "JobLauncher must not be null");
- Assert.notNull(this.jobRegistry, "JobRegistry must not be null");
- Assert.notNull(this.jobExplorer, "JobExplorer must not be null");
Assert.notNull(this.jobRepository, "JobRepository must not be null");
+ Assert.notNull(this.jobRegistry, "JobRegistry must not be null");
+ Assert.notNull(this.transactionManager, "TransactionManager must not be null");
+ if (this.taskExecutor == null) {
+ logger.info("No TaskExecutor has been set, defaulting to synchronous executor.");
+ this.taskExecutor = new SyncTaskExecutor();
+ }
if (this.transactionAttributeSource == null) {
Properties transactionAttributes = new Properties();
String transactionProperties = String.join(",", TRANSACTION_PROPAGATION_PREFIX + Propagation.REQUIRED,
@@ -92,14 +100,6 @@ public void setJobRegistry(JobRegistry jobRegistry) {
this.jobRegistry = jobRegistry;
}
- /**
- * Setter for the job launcher.
- * @param jobLauncher the job launcher to set
- */
- public void setJobLauncher(JobLauncher jobLauncher) {
- this.jobLauncher = jobLauncher;
- }
-
/**
* Setter for the job repository.
* @param jobRepository the job repository to set
@@ -108,22 +108,35 @@ public void setJobRepository(JobRepository jobRepository) {
this.jobRepository = jobRepository;
}
- /**
- * Setter for the job explorer.
- * @param jobExplorer the job explorer to set
- */
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
- }
-
/**
* Setter for the job parameters converter.
* @param jobParametersConverter the job parameters converter to set
+ * @deprecated since 6.0 with nor replacement. Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public void setJobParametersConverter(JobParametersConverter jobParametersConverter) {
this.jobParametersConverter = jobParametersConverter;
}
+ /**
+ * Set the TaskExecutor. (Optional)
+ * @param taskExecutor instance of {@link TaskExecutor}.
+ * @since 6.0
+ */
+ public void setTaskExecutor(TaskExecutor taskExecutor) {
+ this.taskExecutor = taskExecutor;
+ }
+
+ /**
+ * Set the meter registry to use for metrics. Defaults to
+ * {@link Metrics#globalRegistry}.
+ * @param meterRegistry the meter registry
+ * @since 6.0
+ */
+ public void setMeterRegistry(MeterRegistry meterRegistry) {
+ this.meterRegistry = meterRegistry;
+ }
+
/**
* Setter for the transaction manager.
* @param transactionManager the transaction manager to set
@@ -163,15 +176,16 @@ public JobOperator getObject() throws Exception {
return (JobOperator) this.proxyFactory.getProxy(getClass().getClassLoader());
}
- private SimpleJobOperator getTarget() throws Exception {
- SimpleJobOperator simpleJobOperator = new SimpleJobOperator();
- simpleJobOperator.setJobRegistry(this.jobRegistry);
- simpleJobOperator.setJobExplorer(this.jobExplorer);
- simpleJobOperator.setJobRepository(this.jobRepository);
- simpleJobOperator.setJobLauncher(this.jobLauncher);
- simpleJobOperator.setJobParametersConverter(this.jobParametersConverter);
- simpleJobOperator.afterPropertiesSet();
- return simpleJobOperator;
+ @SuppressWarnings("removal")
+ private TaskExecutorJobOperator getTarget() throws Exception {
+ TaskExecutorJobOperator taskExecutorJobOperator = new TaskExecutorJobOperator();
+ taskExecutorJobOperator.setJobRegistry(this.jobRegistry);
+ taskExecutorJobOperator.setJobRepository(this.jobRepository);
+ taskExecutorJobOperator.setTaskExecutor(this.taskExecutor);
+ taskExecutorJobOperator.setMeterRegistry(this.meterRegistry);
+ taskExecutorJobOperator.setJobParametersConverter(this.jobParametersConverter);
+ taskExecutorJobOperator.afterPropertiesSet();
+ return taskExecutorJobOperator;
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java
index b0d9e855f2..7834bfab69 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,8 +23,9 @@
*
* @author Lucas Ward
* @author Dave Syer
- *
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class JvmSystemExiter implements SystemExiter {
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java
index 824aa10363..ee2fac0417 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java
@@ -15,10 +15,10 @@
*/
package org.springframework.batch.core.launch.support;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java
index cc0e3536d4..4a1bf31bf7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,8 +20,10 @@
/**
* @author Dave Syer
- *
+ * @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 with no replacement, for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class RuntimeExceptionTranslator implements MethodInterceptor {
@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java
index 059e769960..53f5b99f50 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -29,23 +29,20 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.configuration.ListableJobLocator;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobExecutionNotRunningException;
import org.springframework.batch.core.launch.JobInstanceAlreadyExistsException;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.launch.NoSuchJobExecutionException;
@@ -66,12 +63,10 @@
import org.springframework.util.Assert;
/**
- * Simple implementation of the JobOperator interface. Due to the amount of functionality
- * the implementation is combining, the following dependencies are required:
+ * Simple implementation of the {@link JobOperator} interface. the following dependencies
+ * are required:
*
*
- *
{@link JobLauncher}
- *
{@link JobExplorer}
*
{@link JobRepository}
*
{@link JobRegistry}
*
@@ -84,22 +79,21 @@
* @author Lucas Ward
* @author Will Schipp
* @author Mahmoud Ben Hassine
+ * @author Andrey Litvitski
* @since 2.0
+ * @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for
+ * removal in 6.2 or later.
*/
-public class SimpleJobOperator implements JobOperator, InitializingBean {
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
+public class SimpleJobOperator extends TaskExecutorJobLauncher implements JobOperator, InitializingBean {
private static final String ILLEGAL_STATE_MSG = "Illegal state (only happens on a race condition): "
+ "%s with name=%s and parameters=%s";
- private ListableJobLocator jobRegistry;
+ protected JobRegistry jobRegistry;
- private JobExplorer jobExplorer;
-
- private JobLauncher jobLauncher;
-
- private JobRepository jobRepository;
-
- private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();
+ protected JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();
private final Log logger = LogFactory.getLog(getClass());
@@ -110,124 +104,102 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
*/
@Override
public void afterPropertiesSet() throws Exception {
- Assert.state(jobLauncher != null, "JobLauncher must be provided");
+ super.afterPropertiesSet();
Assert.state(jobRegistry != null, "JobLocator must be provided");
- Assert.state(jobExplorer != null, "JobExplorer must be provided");
- Assert.state(jobRepository != null, "JobRepository must be provided");
}
/**
* Public setter for the {@link JobParametersConverter}.
* @param jobParametersConverter the {@link JobParametersConverter} to set
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public void setJobParametersConverter(JobParametersConverter jobParametersConverter) {
this.jobParametersConverter = jobParametersConverter;
}
/**
- * Public setter for the {@link ListableJobLocator}.
- * @param jobRegistry the {@link ListableJobLocator} to set
+ * Public setter for the {@link JobRegistry}.
+ * @param jobRegistry the {@link JobRegistry} to set
*/
- public void setJobRegistry(ListableJobLocator jobRegistry) {
+ public void setJobRegistry(JobRegistry jobRegistry) {
this.jobRegistry = jobRegistry;
}
- /**
- * Public setter for the {@link JobExplorer}.
- * @param jobExplorer the {@link JobExplorer} to set
- */
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
- }
-
- public void setJobRepository(JobRepository jobRepository) {
- this.jobRepository = jobRepository;
- }
-
- /**
- * Public setter for the {@link JobLauncher}.
- * @param jobLauncher the {@link JobLauncher} to set
- */
- public void setJobLauncher(JobLauncher jobLauncher) {
- this.jobLauncher = jobLauncher;
- }
-
@Override
- public List getExecutions(long instanceId) throws NoSuchJobInstanceException {
- JobInstance jobInstance = jobExplorer.getJobInstance(instanceId);
- if (jobInstance == null) {
- throw new NoSuchJobInstanceException(String.format("No job instance with id=%d", instanceId));
- }
- List list = new ArrayList<>();
- for (JobExecution jobExecution : jobExplorer.getJobExecutions(jobInstance)) {
- list.add(jobExecution.getId());
+ @Deprecated(since = "6.0", forRemoval = true)
+ public Long start(String jobName, Properties parameters)
+ throws NoSuchJobException, JobInstanceAlreadyExistsException, JobParametersInvalidException {
+ if (logger.isInfoEnabled()) {
+ logger.info("Checking status of job with name=" + jobName);
}
- return list;
- }
- @Override
- public Set getJobNames() {
- return new TreeSet<>(jobRegistry.getJobNames());
- }
+ JobParameters jobParameters = jobParametersConverter.getJobParameters(parameters);
- @Override
- public List getJobInstances(String jobName, int start, int count) throws NoSuchJobException {
- List list = new ArrayList<>();
- List jobInstances = jobExplorer.getJobInstances(jobName, start, count);
- for (JobInstance jobInstance : jobInstances) {
- list.add(jobInstance.getId());
- }
- if (list.isEmpty() && !jobRegistry.getJobNames().contains(jobName)) {
- throw new NoSuchJobException("No such job (either in registry or in historical data): " + jobName);
+ if (jobRepository.getJobInstance(jobName, jobParameters) != null) {
+ throw new JobInstanceAlreadyExistsException(
+ String.format("Cannot start a job instance that already exists with name=%s and parameters={%s}",
+ jobName, parameters));
}
- return list;
- }
-
- @Override
- @Nullable
- public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
- return this.jobExplorer.getJobInstance(jobName, jobParameters);
- }
-
- @Override
- public String getParameters(long executionId) throws NoSuchJobExecutionException {
- JobExecution jobExecution = findExecutionById(executionId);
-
- Properties properties = this.jobParametersConverter.getProperties(jobExecution.getJobParameters());
-
- return PropertiesConverter.propertiesToString(properties);
- }
- @Override
- public Set getRunningExecutions(String jobName) throws NoSuchJobException {
- Set set = new LinkedHashSet<>();
- for (JobExecution jobExecution : jobExplorer.findRunningJobExecutions(jobName)) {
- set.add(jobExecution.getId());
+ Job job = jobRegistry.getJob(jobName);
+ if (logger.isInfoEnabled()) {
+ logger
+ .info(String.format("Attempting to launch job with name=%s and parameters={%s}", jobName, parameters));
}
- if (set.isEmpty() && !jobRegistry.getJobNames().contains(jobName)) {
- throw new NoSuchJobException("No such job (either in registry or in historical data): " + jobName);
+ try {
+ return run(job, jobParameters).getId();
}
- return set;
- }
-
- @Override
- public Map getStepExecutionSummaries(long executionId) throws NoSuchJobExecutionException {
- JobExecution jobExecution = findExecutionById(executionId);
-
- Map map = new LinkedHashMap<>();
- for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
- map.put(stepExecution.getId(), stepExecution.toString());
+ catch (JobExecutionAlreadyRunningException e) {
+ throw new UnexpectedJobExecutionException(
+ String.format(ILLEGAL_STATE_MSG, "job execution already running", jobName, parameters), e);
}
- return map;
+ catch (JobRestartException e) {
+ throw new UnexpectedJobExecutionException(
+ String.format(ILLEGAL_STATE_MSG, "job not restartable", jobName, parameters), e);
+ }
+ catch (JobInstanceAlreadyCompleteException e) {
+ throw new UnexpectedJobExecutionException(
+ String.format(ILLEGAL_STATE_MSG, "job already complete", jobName, parameters), e);
+ }
+
}
- @Override
- public String getSummary(long executionId) throws NoSuchJobExecutionException {
- JobExecution jobExecution = findExecutionById(executionId);
- return jobExecution.toString();
+ /**
+ * Start a new instance of a job with the specified parameters. If the job defines a
+ * {@link JobParametersIncrementer}, then the incrementer will be used to calculate
+ * the next parameters in the sequence and the provided parameters will be ignored.
+ * @param job the {@link Job} to start
+ * @param jobParameters the {@link JobParameters} to start the job with
+ * @return the {@link JobExecution} that was started
+ * @throws NoSuchJobException if the given {@link Job} is not registered
+ * @throws JobParametersInvalidException thrown if any of the job parameters are
+ * @throws JobExecutionAlreadyRunningException if the JobInstance identified by the
+ * properties already has an execution running. invalid.
+ * @throws JobRestartException if the execution would be a re-start, but a re-start is
+ * either not allowed or not needed.
+ * @throws JobInstanceAlreadyCompleteException if the job has been run before with the
+ * same parameters and completed successfully
+ * @throws IllegalArgumentException if the job or job parameters are null.
+ */
+ public JobExecution start(Job job, JobParameters jobParameters)
+ throws NoSuchJobException, JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException,
+ JobRestartException, JobParametersInvalidException {
+ Assert.notNull(job, "The Job must not be null.");
+ Assert.notNull(jobParameters, "The JobParameters must not be null.");
+ if (job.getJobParametersIncrementer() != null) {
+ if (!jobParameters.isEmpty() && logger.isWarnEnabled()) {
+ logger.warn(String.format(
+ "Attempting to launch job: [%s] which defines an incrementer with additional parameters: [%s]. Additional parameters will be ignored.",
+ job.getName(), jobParameters));
+ }
+ return startNextInstance(job);
+ }
+ return run(job, jobParameters);
}
@Override
+ @Deprecated(since = "6.0", forRemoval = true)
public Long restart(long executionId) throws JobInstanceAlreadyCompleteException, NoSuchJobExecutionException,
NoSuchJobException, JobRestartException, JobParametersInvalidException {
@@ -244,7 +216,7 @@ public Long restart(long executionId) throws JobInstanceAlreadyCompleteException
logger.info(String.format("Attempting to resume job with name=%s and parameters=%s", jobName, parameters));
}
try {
- return jobLauncher.run(job, parameters).getId();
+ return run(job, parameters).getId();
}
catch (JobExecutionAlreadyRunningException e) {
throw new UnexpectedJobExecutionException(
@@ -254,44 +226,28 @@ public Long restart(long executionId) throws JobInstanceAlreadyCompleteException
}
@Override
- public Long start(String jobName, Properties parameters)
- throws NoSuchJobException, JobInstanceAlreadyExistsException, JobParametersInvalidException {
- if (logger.isInfoEnabled()) {
- logger.info("Checking status of job with name=" + jobName);
- }
-
- JobParameters jobParameters = jobParametersConverter.getJobParameters(parameters);
-
- if (jobRepository.isJobInstanceExists(jobName, jobParameters)) {
- throw new JobInstanceAlreadyExistsException(
- String.format("Cannot start a job instance that already exists with name=%s and parameters={%s}",
- jobName, parameters));
- }
+ public JobExecution restart(JobExecution jobExecution) throws JobInstanceAlreadyCompleteException,
+ NoSuchJobExecutionException, NoSuchJobException, JobRestartException, JobParametersInvalidException {
+ String jobName = jobExecution.getJobInstance().getJobName();
Job job = jobRegistry.getJob(jobName);
+ JobParameters parameters = jobExecution.getJobParameters();
+
if (logger.isInfoEnabled()) {
- logger
- .info(String.format("Attempting to launch job with name=%s and parameters={%s}", jobName, parameters));
+ logger.info("Resuming job execution: " + jobExecution);
}
try {
- return jobLauncher.run(job, jobParameters).getId();
+ return run(job, parameters);
}
catch (JobExecutionAlreadyRunningException e) {
throw new UnexpectedJobExecutionException(
String.format(ILLEGAL_STATE_MSG, "job execution already running", jobName, parameters), e);
}
- catch (JobRestartException e) {
- throw new UnexpectedJobExecutionException(
- String.format(ILLEGAL_STATE_MSG, "job not restartable", jobName, parameters), e);
- }
- catch (JobInstanceAlreadyCompleteException e) {
- throw new UnexpectedJobExecutionException(
- String.format(ILLEGAL_STATE_MSG, "job already complete", jobName, parameters), e);
- }
}
@Override
+ @Deprecated(since = "6.0", forRemoval = true)
public Long startNextInstance(String jobName)
throws NoSuchJobException, UnexpectedJobExecutionException, JobParametersInvalidException {
if (logger.isInfoEnabled()) {
@@ -299,32 +255,69 @@ public Long startNextInstance(String jobName)
}
Job job = jobRegistry.getJob(jobName);
- JobParameters parameters = new JobParametersBuilder(jobExplorer).getNextJobParameters(job).toJobParameters();
+ return startNextInstance(job).getId();
+ }
+
+ @Override
+ public JobExecution startNextInstance(Job job) throws UnexpectedJobExecutionException {
+ Assert.notNull(job, "Job must not be null");
+ Assert.notNull(job.getJobParametersIncrementer(),
+ "No job parameters incrementer found for job=" + job.getName());
+ String name = job.getName();
+ JobParameters nextParameters;
+ JobInstance lastInstance = jobRepository.getLastJobInstance(name);
+ JobParametersIncrementer incrementer = job.getJobParametersIncrementer();
+ if (lastInstance == null) {
+ // Start from a completely clean sheet
+ nextParameters = incrementer.getNext(new JobParameters());
+ }
+ else {
+ JobExecution previousExecution = jobRepository.getLastJobExecution(lastInstance);
+ if (previousExecution == null) {
+ // Normally this will not happen - an instance exists with no executions
+ nextParameters = incrementer.getNext(new JobParameters());
+ }
+ else {
+ nextParameters = incrementer.getNext(previousExecution.getJobParameters());
+ }
+ }
if (logger.isInfoEnabled()) {
- logger.info(String.format("Attempting to launch job with name=%s and parameters=%s", jobName, parameters));
+ logger.info("Launching next instance of job: [" + job.getName() + "] with parameters: [" + nextParameters
+ + "]");
}
try {
- return jobLauncher.run(job, parameters).getId();
+ return run(job, nextParameters);
}
catch (JobExecutionAlreadyRunningException e) {
throw new UnexpectedJobExecutionException(
- String.format(ILLEGAL_STATE_MSG, "job already running", jobName, parameters), e);
+ String.format(ILLEGAL_STATE_MSG, "job already running", job.getName(), nextParameters), e);
}
catch (JobRestartException e) {
throw new UnexpectedJobExecutionException(
- String.format(ILLEGAL_STATE_MSG, "job not restartable", jobName, parameters), e);
+ String.format(ILLEGAL_STATE_MSG, "job not restartable", job.getName(), nextParameters), e);
}
catch (JobInstanceAlreadyCompleteException e) {
throw new UnexpectedJobExecutionException(
- String.format(ILLEGAL_STATE_MSG, "job instance already complete", jobName, parameters), e);
+ String.format(ILLEGAL_STATE_MSG, "job instance already complete", job.getName(), nextParameters),
+ e);
+ }
+ catch (JobParametersInvalidException e) {
+ throw new UnexpectedJobExecutionException("Invalid job parameters " + nextParameters, e);
}
}
@Override
+ @Deprecated(since = "6.0", forRemoval = true)
public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExecutionNotRunningException {
JobExecution jobExecution = findExecutionById(executionId);
+ return stop(jobExecution);
+ }
+
+ @Override
+ public boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningException {
+ Assert.notNull(jobExecution, "JobExecution must not be null");
// Indicate the execution should be stopped by setting it's status to
// 'STOPPING'. It is assumed that
// the step implementation will check this status at chunk boundaries.
@@ -333,24 +326,27 @@ public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExe
throw new JobExecutionNotRunningException(
"JobExecution must be running so that it can be stopped: " + jobExecution);
}
+ if (logger.isInfoEnabled()) {
+ logger.info("Stopping job execution: " + jobExecution);
+ }
jobExecution.setStatus(BatchStatus.STOPPING);
jobRepository.update(jobExecution);
try {
Job job = jobRegistry.getJob(jobExecution.getJobInstance().getJobName());
- if (job instanceof StepLocator) {// can only process as StepLocator is the
- // only way to get the step object
+ if (job instanceof StepLocator stepLocator) {
+ // can only process as StepLocator is the only way to get the step object
// get the current stepExecution
for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
if (stepExecution.getStatus().isRunning()) {
try {
// have the step execution that's running -> need to 'stop' it
- Step step = ((StepLocator) job).getStep(stepExecution.getStepName());
- if (step instanceof TaskletStep) {
- Tasklet tasklet = ((TaskletStep) step).getTasklet();
- if (tasklet instanceof StoppableTasklet) {
+ Step step = stepLocator.getStep(stepExecution.getStepName());
+ if (step instanceof TaskletStep taskletStep) {
+ Tasklet tasklet = taskletStep.getTasklet();
+ if (tasklet instanceof StoppableTasklet stoppableTasklet) {
StepSynchronizationManager.register(stepExecution);
- ((StoppableTasklet) tasklet).stop();
+ stoppableTasklet.stop();
StepSynchronizationManager.release();
}
}
@@ -370,10 +366,17 @@ public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExe
}
@Override
+ @Deprecated(since = "6.0", forRemoval = true)
public JobExecution abandon(long jobExecutionId)
throws NoSuchJobExecutionException, JobExecutionAlreadyRunningException {
JobExecution jobExecution = findExecutionById(jobExecutionId);
+ return abandon(jobExecution);
+ }
+
+ @Override
+ public JobExecution abandon(JobExecution jobExecution) throws JobExecutionAlreadyRunningException {
+ Assert.notNull(jobExecution, "JobExecution must not be null");
if (jobExecution.getStatus().isLessThan(BatchStatus.STOPPING)) {
throw new JobExecutionAlreadyRunningException(
"JobExecution is running or complete and therefore cannot be aborted");
@@ -388,8 +391,91 @@ public JobExecution abandon(long jobExecutionId)
return jobExecution;
}
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public Set getJobNames() {
+ return new TreeSet<>(jobRegistry.getJobNames());
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public List getExecutions(long instanceId) throws NoSuchJobInstanceException {
+ JobInstance jobInstance = jobRepository.getJobInstance(instanceId);
+ if (jobInstance == null) {
+ throw new NoSuchJobInstanceException(String.format("No job instance with id=%d", instanceId));
+ }
+ List list = new ArrayList<>();
+ for (JobExecution jobExecution : jobRepository.getJobExecutions(jobInstance)) {
+ list.add(jobExecution.getId());
+ }
+ return list;
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public List getJobInstances(String jobName, int start, int count) throws NoSuchJobException {
+ List list = new ArrayList<>();
+ List jobInstances = jobRepository.getJobInstances(jobName, start, count);
+ for (JobInstance jobInstance : jobInstances) {
+ list.add(jobInstance.getId());
+ }
+ if (list.isEmpty() && !jobRegistry.getJobNames().contains(jobName)) {
+ throw new NoSuchJobException("No such job (either in registry or in historical data): " + jobName);
+ }
+ return list;
+ }
+
+ @Override
+ @Nullable
+ @Deprecated(since = "6.0", forRemoval = true)
+ public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
+ return this.jobRepository.getJobInstance(jobName, jobParameters);
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public String getParameters(long executionId) throws NoSuchJobExecutionException {
+ JobExecution jobExecution = findExecutionById(executionId);
+
+ Properties properties = this.jobParametersConverter.getProperties(jobExecution.getJobParameters());
+
+ return PropertiesConverter.propertiesToString(properties);
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public Set getRunningExecutions(String jobName) throws NoSuchJobException {
+ Set set = new LinkedHashSet<>();
+ for (JobExecution jobExecution : jobRepository.findRunningJobExecutions(jobName)) {
+ set.add(jobExecution.getId());
+ }
+ if (set.isEmpty() && !jobRegistry.getJobNames().contains(jobName)) {
+ throw new NoSuchJobException("No such job (either in registry or in historical data): " + jobName);
+ }
+ return set;
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public Map getStepExecutionSummaries(long executionId) throws NoSuchJobExecutionException {
+ JobExecution jobExecution = findExecutionById(executionId);
+
+ Map map = new LinkedHashMap<>();
+ for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
+ map.put(stepExecution.getId(), stepExecution.toString());
+ }
+ return map;
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public String getSummary(long executionId) throws NoSuchJobExecutionException {
+ JobExecution jobExecution = findExecutionById(executionId);
+ return jobExecution.toString();
+ }
+
private JobExecution findExecutionById(long executionId) throws NoSuchJobExecutionException {
- JobExecution jobExecution = jobExplorer.getJobExecution(executionId);
+ JobExecution jobExecution = jobRepository.getJobExecution(executionId);
if (jobExecution == null) {
throw new NoSuchJobExecutionException("No JobExecution found for id: [" + executionId + "]");
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SystemExiter.java
index a94c8b116f..d3b980fb9b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SystemExiter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SystemExiter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,8 +21,9 @@
* unit test would cause the entire jvm to finish.
*
* @author Lucas Ward
- *
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public interface SystemExiter {
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
index aab3443cd5..0448c533bf 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -25,12 +25,12 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.observability.BatchMetrics;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -65,18 +65,22 @@
* @since 1.0
* @see JobRepository
* @see TaskExecutor
+ * @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for
+ * removal in 6.2 or later.
*/
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
public class TaskExecutorJobLauncher implements JobLauncher, InitializingBean {
protected static final Log logger = LogFactory.getLog(TaskExecutorJobLauncher.class);
- private JobRepository jobRepository;
+ protected JobRepository jobRepository;
- private TaskExecutor taskExecutor;
+ protected TaskExecutor taskExecutor;
- private MeterRegistry meterRegistry = Metrics.globalRegistry;
+ protected MeterRegistry meterRegistry = Metrics.globalRegistry;
- private Counter jobLaunchCount; // NoopCounter is still incubating
+ protected Counter jobLaunchCount; // NoopCounter is still incubating
/**
* Run the provided job with the given {@link JobParameters}. The
@@ -173,11 +177,11 @@ public void run() {
}
private void rethrow(Throwable t) {
- if (t instanceof RuntimeException) {
- throw (RuntimeException) t;
+ if (t instanceof RuntimeException runtimeException) {
+ throw runtimeException;
}
- else if (t instanceof Error) {
- throw (Error) t;
+ else if (t instanceof Error error) {
+ throw error;
}
throw new IllegalStateException(t);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperator.java
new file mode 100644
index 0000000000..32e280ae5f
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperator.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2022-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.launch.support;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.launch.JobExecutionNotRunningException;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.launch.NoSuchJobExecutionException;
+import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link org.springframework.core.task.TaskExecutor}-based implementation of the
+ * {@link JobOperator} interface. The following dependencies are required:
+ *
+ *
+ *
{@link JobRepository}
+ *
{@link JobRegistry}
+ *
+ *
+ * This class can be instantiated with a {@link JobOperatorFactoryBean} to create a
+ * transactional proxy around the job operator.
+ *
+ * @see JobOperatorFactoryBean
+ * @author Dave Syer
+ * @author Lucas Ward
+ * @author Will Schipp
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ */
+@SuppressWarnings("removal")
+public class TaskExecutorJobOperator extends SimpleJobOperator {
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ super.afterPropertiesSet();
+ }
+
+ @Override
+ public void setJobRegistry(JobRegistry jobRegistry) {
+ Assert.notNull(jobRegistry, "JobRegistry must not be null");
+ this.jobRegistry = jobRegistry;
+ }
+
+ @Override
+ public void setJobRepository(JobRepository jobRepository) {
+ Assert.notNull(jobRepository, "JobRepository must not be null");
+ this.jobRepository = jobRepository;
+ }
+
+ @Override
+ public void setTaskExecutor(TaskExecutor taskExecutor) {
+ Assert.notNull(taskExecutor, "TaskExecutor must not be null");
+ this.taskExecutor = taskExecutor;
+ }
+
+ @Override
+ public void setMeterRegistry(MeterRegistry meterRegistry) {
+ Assert.notNull(meterRegistry, "MeterRegistry must not be null");
+ this.meterRegistry = meterRegistry;
+ }
+
+ @Override
+ public JobExecution start(Job job, JobParameters jobParameters)
+ throws NoSuchJobException, JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException,
+ JobRestartException, JobParametersInvalidException {
+ Assert.notNull(job, "Job must not be null");
+ Assert.notNull(jobParameters, "JobParameters must not be null");
+ return super.start(job, jobParameters);
+ }
+
+ @Override
+ public JobExecution restart(JobExecution jobExecution) throws JobInstanceAlreadyCompleteException,
+ NoSuchJobExecutionException, NoSuchJobException, JobRestartException, JobParametersInvalidException {
+ Assert.notNull(jobExecution, "JobExecution must not be null");
+ return super.restart(jobExecution);
+ }
+
+ @Override
+ public JobExecution startNextInstance(Job job) throws UnexpectedJobExecutionException {
+ Assert.notNull(job, "Job must not be null");
+ return super.startNextInstance(job);
+ }
+
+ @Override
+ public boolean stop(JobExecution jobExecution) throws JobExecutionNotRunningException {
+ Assert.notNull(jobExecution, "JobExecution must not be null");
+ return super.stop(jobExecution);
+ }
+
+ @Override
+ public JobExecution abandon(JobExecution jobExecution) throws JobExecutionAlreadyRunningException {
+ Assert.notNull(jobExecution, "JobExecution must not be null");
+ return super.abandon(jobExecution);
+ }
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java
index 18c9e4cf2e..00ca69e6fd 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java
@@ -150,8 +150,8 @@ public Object getObject() {
// create a proxy listener for only the interfaces that have methods to
// be called
ProxyFactory proxyFactory = new ProxyFactory();
- if (delegate instanceof Advised) {
- proxyFactory.setTargetSource(((Advised) delegate).getTargetSource());
+ if (delegate instanceof Advised advised) {
+ proxyFactory.setTargetSource(advised.getTargetSource());
}
else {
proxyFactory.setTarget(delegate);
@@ -214,15 +214,13 @@ public static boolean isListener(Object target, Class listenerType, ListenerM
if (listenerType.isInstance(target)) {
return true;
}
- if (target instanceof Advised) {
- TargetSource targetSource = ((Advised) target).getTargetSource();
- if (targetSource != null && targetSource.getTargetClass() != null
- && listenerType.isAssignableFrom(targetSource.getTargetClass())) {
+ if (target instanceof Advised advised) {
+ TargetSource targetSource = advised.getTargetSource();
+ if (targetSource.getTargetClass() != null && listenerType.isAssignableFrom(targetSource.getTargetClass())) {
return true;
}
- if (targetSource != null && targetSource.getTargetClass() != null
- && targetSource.getTargetClass().isInterface()) {
+ if (targetSource.getTargetClass() != null && targetSource.getTargetClass().isInterface()) {
logger.warn(String.format(
"%s is an interface. The implementing class will not be queried for annotation based listener configurations. If using @StepScope on a @Bean method, be sure to return the implementing class so listener annotations can be used.",
targetSource.getTargetClass().getName()));
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListener.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListener.java
index 951410235b..551bee1723 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
import org.springframework.batch.core.scope.context.ChunkContext;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java
deleted file mode 100644
index 79d742240e..0000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.listener;
-
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.scope.context.ChunkContext;
-
-/**
- * Basic support implementation of {@link ChunkListener}
- *
- * @author Lucas Ward
- * @author Michael Minella
- * @deprecated as of 5.0, in favor of the default methods on the {@link ChunkListener}
- */
-@Deprecated
-public class ChunkListenerSupport implements ChunkListener {
-
- @Override
- public void afterChunk(ChunkContext context) {
- }
-
- @Override
- public void beforeChunk(ChunkContext context) {
- }
-
- @Override
- public void afterChunkError(ChunkContext context) {
- }
-
-}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java
index 1d7b747012..0788c52415 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,7 +19,6 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.ChunkListener;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.core.Ordered;
@@ -74,7 +73,7 @@ public void register(ChunkListener chunkListener) {
/**
* Call the registered listeners in reverse order.
*
- * @see org.springframework.batch.core.ChunkListener#afterChunk(ChunkContext context)
+ * @see ChunkListener#afterChunk(ChunkContext context)
*/
@Override
public void afterChunk(ChunkContext context) {
@@ -88,7 +87,7 @@ public void afterChunk(ChunkContext context) {
* Call the registered listeners in order, respecting and prioritizing those that
* implement {@link Ordered}.
*
- * @see org.springframework.batch.core.ChunkListener#beforeChunk(ChunkContext context)
+ * @see ChunkListener#beforeChunk(ChunkContext context)
*/
@Override
public void beforeChunk(ChunkContext context) {
@@ -101,8 +100,7 @@ public void beforeChunk(ChunkContext context) {
/**
* Call the registered listeners in reverse order.
*
- * @see org.springframework.batch.core.ChunkListener#afterChunkError(ChunkContext
- * context)
+ * @see ChunkListener#afterChunkError(ChunkContext context)
*/
@Override
public void afterChunkError(ChunkContext context) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java
index 882770dbd4..19c966a503 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,6 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.ItemProcessListener;
import org.springframework.core.Ordered;
import org.springframework.lang.Nullable;
@@ -52,8 +51,7 @@ public void register(ItemProcessListener itemProcessorList
/**
* Call the registered listeners in reverse order, respecting and prioritising those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemProcessListener#afterProcess(java.lang.Object,
- * java.lang.Object)
+ * @see ItemProcessListener#afterProcess(java.lang.Object, java.lang.Object)
*/
@Override
public void afterProcess(T item, @Nullable S result) {
@@ -66,7 +64,7 @@ public void afterProcess(T item, @Nullable S result) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemProcessListener#beforeProcess(java.lang.Object)
+ * @see ItemProcessListener#beforeProcess(java.lang.Object)
*/
@Override
public void beforeProcess(T item) {
@@ -79,8 +77,7 @@ public void beforeProcess(T item) {
/**
* Call the registered listeners in reverse order, respecting and prioritising those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemProcessListener#onProcessError(java.lang.Object,
- * java.lang.Exception)
+ * @see ItemProcessListener#onProcessError(java.lang.Object, java.lang.Exception)
*/
@Override
public void onProcessError(T item, Exception e) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java
index 18fa7599a7..f006af5458 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,6 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.ItemReadListener;
import org.springframework.core.Ordered;
/**
@@ -51,7 +50,7 @@ public void register(ItemReadListener itemReaderListener) {
/**
* Call the registered listeners in reverse order, respecting and prioritising those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemReadListener#afterRead(java.lang.Object)
+ * @see ItemReadListener#afterRead(java.lang.Object)
*/
@Override
public void afterRead(T item) {
@@ -64,7 +63,7 @@ public void afterRead(T item) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemReadListener#beforeRead()
+ * @see ItemReadListener#beforeRead()
*/
@Override
public void beforeRead() {
@@ -77,7 +76,7 @@ public void beforeRead() {
/**
* Call the registered listeners in reverse order, respecting and prioritising those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.ItemReadListener#onReadError(java.lang.Exception)
+ * @see ItemReadListener#onReadError(java.lang.Exception)
*/
@Override
public void onReadError(Exception ex) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
index 300bc30a9e..cf7b1916ac 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,6 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.ItemWriteListener;
import org.springframework.batch.item.Chunk;
import org.springframework.core.Ordered;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java
index 304b1b2a92..c769d1ceaa 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,8 +18,7 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.core.Ordered;
/**
@@ -51,7 +50,7 @@ public void register(JobExecutionListener jobExecutionListener) {
/**
* Call the registered listeners in reverse order, respecting and prioritising those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.JobExecutionListener#afterJob(org.springframework.batch.core.JobExecution)
+ * @see JobExecutionListener#afterJob(JobExecution)
*/
@Override
public void afterJob(JobExecution jobExecution) {
@@ -64,7 +63,7 @@ public void afterJob(JobExecution jobExecution) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.JobExecutionListener#beforeJob(org.springframework.batch.core.JobExecution)
+ * @see JobExecutionListener#beforeJob(JobExecution)
*/
@Override
public void beforeJob(JobExecution jobExecution) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java
index 13a355b8c0..d2f969527f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,6 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.batch.core.SkipListener;
import org.springframework.core.Ordered;
/**
@@ -49,7 +48,7 @@ public void register(SkipListener listener) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable)
+ * @see SkipListener#onSkipInRead(java.lang.Throwable)
*/
@Override
public void onSkipInRead(Throwable t) {
@@ -62,8 +61,7 @@ public void onSkipInRead(Throwable t) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object,
- * java.lang.Throwable)
+ * @see SkipListener#onSkipInWrite(java.lang.Object, java.lang.Throwable)
*/
@Override
public void onSkipInWrite(S item, Throwable t) {
@@ -76,8 +74,7 @@ public void onSkipInWrite(S item, Throwable t) {
/**
* Call the registered listeners in order, respecting and prioritising those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object,
- * java.lang.Throwable)
+ * @see SkipListener#onSkipInWrite(java.lang.Object, java.lang.Throwable)
*/
@Override
public void onSkipInProcess(T item, Throwable t) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java
index bfaa770926..b3421897ae 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,8 +19,7 @@
import java.util.Iterator;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.core.Ordered;
import org.springframework.lang.Nullable;
@@ -55,7 +54,7 @@ public void register(StepExecutionListener stepExecutionListener) {
/**
* Call the registered listeners in reverse order, respecting and prioritizing those
* that implement {@link Ordered}.
- * @see org.springframework.batch.core.StepExecutionListener#afterStep(StepExecution)
+ * @see StepExecutionListener#afterStep(StepExecution)
*/
@Nullable
@Override
@@ -71,7 +70,7 @@ public ExitStatus afterStep(StepExecution stepExecution) {
/**
* Call the registered listeners in order, respecting and prioritizing those that
* implement {@link Ordered}.
- * @see org.springframework.batch.core.StepExecutionListener#beforeStep(StepExecution)
+ * @see StepExecutionListener#beforeStep(StepExecution)
*/
@Override
public void beforeStep(StepExecution stepExecution) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
index 525dc86b92..262cda639a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,10 +16,9 @@
package org.springframework.batch.core.listener;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.support.PatternMatcher;
import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java
index f2023a9294..e283904216 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,10 +15,6 @@
*/
package org.springframework.batch.core.listener;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-
/**
* Basic no-op implementation of the {@link ItemReadListener},
* {@link ItemProcessListener}, and {@link ItemWriteListener} interfaces. All are
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemProcessListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemProcessListener.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/ItemProcessListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemProcessListener.java
index 23f6cf4bd4..fb3d394fcc 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemProcessListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemProcessListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemReadListener.java
similarity index 92%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemReadListener.java
index d12e80e629..7a6dc6f710 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemReadListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
import org.springframework.batch.item.ItemReader;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemWriteListener.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemWriteListener.java
index 46c55786c0..9e05c5458b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemWriteListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.item.Chunk;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListener.java
similarity index 87%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListener.java
index bd0c7b6a92..814fd8846a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
+
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
/**
* Provide callbacks at specific points in the lifecycle of a {@link Job}. Implementations
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java
deleted file mode 100644
index fe54e5a6b6..0000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.listener;
-
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
-
-/**
- * @author Dave Syer
- * @deprecated as of 5.0, in favor of the default methods on the
- * {@link JobExecutionListener}
- */
-@Deprecated
-public class JobExecutionListenerSupport implements JobExecutionListener {
-
- @Override
- public void afterJob(JobExecution jobExecution) {
- }
-
- @Override
- public void beforeJob(JobExecution jobExecution) {
- }
-
-}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java
index 76ae37e5f0..87428c364c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -15,8 +15,6 @@
*/
package org.springframework.batch.core.listener;
-import org.springframework.batch.core.JobExecutionListener;
-
/**
* This {@link AbstractListenerFactoryBean} implementation is used to create a
* {@link JobExecutionListener}.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java
index 3f5b515502..a268ebcc3d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -19,8 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.annotation.AfterJob;
import org.springframework.batch.core.annotation.BeforeJob;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobParameterExecutionContextCopyListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobParameterExecutionContextCopyListener.java
index c26d473ad0..277a712389 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobParameterExecutionContextCopyListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobParameterExecutionContextCopyListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,10 +18,9 @@
import java.util.Arrays;
import java.util.Collection;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java
index b6cd083e9a..78a5d81701 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -21,7 +21,7 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.support.MethodInvoker;
/**
@@ -29,8 +29,7 @@
* will execute all methods tied to a particular method name, with the provided arguments.
* The only possible return value that is handled is of type ExitStatus, since the only
* StepListener implementation that isn't void is
- * {@link StepExecutionListener#afterStep(org.springframework.batch.core.StepExecution)} ,
- * which returns ExitStatus.
+ * {@link StepExecutionListener#afterStep(StepExecution)} , which returns ExitStatus.
*
* @author Lucas Ward
* @author Mahmoud Ben Hassine
@@ -68,12 +67,12 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
ExitStatus status = null;
for (MethodInvoker invoker : invokers) {
Object retVal = invoker.invokeMethod(invocation.getArguments());
- if (retVal instanceof ExitStatus) {
+ if (retVal instanceof ExitStatus exitStatus) {
if (status != null) {
- status = status.and((ExitStatus) retVal);
+ status = status.and(exitStatus);
}
else {
- status = (ExitStatus) retVal;
+ status = exitStatus;
}
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
index 81db370944..02ef2821fa 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,15 +18,8 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import org.springframework.batch.core.ChunkListener;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.ItemStream;
@@ -78,11 +71,11 @@ public void setListeners(List listeners) {
* @param listener the {@link StepListener} instance to be registered.
*/
public void register(StepListener listener) {
- if (listener instanceof StepExecutionListener) {
- this.stepListener.register((StepExecutionListener) listener);
+ if (listener instanceof StepExecutionListener stepExecutionListener) {
+ this.stepListener.register(stepExecutionListener);
}
- if (listener instanceof ChunkListener) {
- this.chunkListener.register((ChunkListener) listener);
+ if (listener instanceof ChunkListener cl) {
+ this.chunkListener.register(cl);
}
if (listener instanceof ItemReadListener) {
@SuppressWarnings("unchecked")
@@ -162,7 +155,7 @@ public ExitStatus afterStep(StepExecution stepExecution) {
}
/**
- * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#beforeStep(org.springframework.batch.core.StepExecution)
+ * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#beforeStep(StepExecution)
*/
@Override
public void beforeStep(StepExecution stepExecution) {
@@ -323,8 +316,8 @@ public void afterChunkError(ChunkContext context) {
*/
private Throwable getTargetException(RuntimeException e) {
Throwable cause = e.getCause();
- if (cause != null && cause instanceof InvocationTargetException) {
- return ((InvocationTargetException) cause).getTargetException();
+ if (cause instanceof InvocationTargetException invocationTargetException) {
+ return invocationTargetException.getTargetException();
}
return e;
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListener.java
similarity index 92%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListener.java
index 57c79e56dc..64c08b0a03 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
+
+import org.springframework.batch.core.step.Step;
/**
* Interface for listener to skipped items. Callbacks are called by {@link Step}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java
deleted file mode 100644
index 00001e2ee3..0000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.listener;
-
-import org.springframework.batch.core.SkipListener;
-
-/**
- * Basic no-op implementations of all {@link SkipListener} implementations.
- *
- * @author Dave Syer
- * @author Mahmoud Ben Hassine
- * @deprecated as of v5.0 in favor of the default methods in {@link SkipListener}.
- *
- */
-@Deprecated
-public class SkipListenerSupport implements SkipListener {
-
- @Override
- public void onSkipInRead(Throwable t) {
- }
-
- @Override
- public void onSkipInWrite(S item, Throwable t) {
- }
-
- @Override
- public void onSkipInProcess(T item, Throwable t) {
- }
-
-}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListener.java
similarity index 86%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListener.java
index f1e9a26baf..9c451b417c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,8 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java
deleted file mode 100644
index bd4bedb07f..0000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.listener;
-
-import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.lang.Nullable;
-
-/**
- * @author Dave Syer
- * @deprecated as of 5.0, in favor of the default methods on the
- * {@link StepExecutionListener}
- */
-@Deprecated
-public class StepExecutionListenerSupport implements StepExecutionListener {
-
- @Nullable
- @Override
- public ExitStatus afterStep(StepExecution stepExecution) {
- return null;
- }
-
- @Override
- public void beforeStep(StepExecution stepExecution) {
- }
-
-}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListener.java
similarity index 89%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListener.java
index 7e12fa48f5..e3282e4901 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.listener;
/**
* Marker interface that acts as a parent to all step domain listeners, such as:
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
index ace030474c..196f4ca16a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -15,8 +15,6 @@
*/
package org.springframework.batch.core.listener;
-import org.springframework.batch.core.StepListener;
-
/**
* This {@link AbstractListenerFactoryBean} implementation is used to create a
* {@link StepListener}.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
index 943497828f..7ceff8a96f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -19,14 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.annotation.AfterChunk;
import org.springframework.batch.core.annotation.AfterChunkError;
import org.springframework.batch.core.annotation.AfterProcess;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java
index bc10b1d2bd..ca707f9874 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,11 +15,6 @@
*/
package org.springframework.batch.core.listener;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
-
/**
* Basic no-op implementations of all {@link StepListener} interfaces.
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java
index 4c593fd3f0..9527f6bf85 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java
@@ -18,7 +18,7 @@
import io.micrometer.observation.Observation;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import java.util.function.Supplier;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java
index a0d6196b1a..7e5a9e7595 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java
@@ -176,7 +176,7 @@ public static String formatDuration(@Nullable Duration duration) {
StringBuilder formattedDuration = new StringBuilder();
long hours = duration.toHours();
long minutes = duration.toMinutes();
- long seconds = duration.getSeconds();
+ long seconds = duration.toSeconds();
long millis = duration.toMillis();
if (hours != 0) {
formattedDuration.append(hours).append("h");
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java
index 7b1a3a0bdc..4911acd594 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java
@@ -18,7 +18,7 @@
import io.micrometer.observation.Observation;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import java.util.function.Supplier;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java
index 84712acf62..7161e97ce9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java
@@ -17,7 +17,7 @@
import io.micrometer.common.KeyValues;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
/**
* Default {@link BatchJobObservationConvention} implementation.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java
index 6fcf6b0508..28fc91f68f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java
@@ -17,7 +17,7 @@
import io.micrometer.common.KeyValues;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
/**
* Default {@link BatchStepObservationConvention} implementation.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionHandler.java
index 81373f9cae..648bc46473 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionHandler.java
@@ -18,7 +18,7 @@
import java.util.Collection;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java
similarity index 87%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java
index 6198b3a1d9..745111eb57 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2009 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package org.springframework.batch.core.partition.support;
+package org.springframework.batch.core.partition;
+
+import org.springframework.batch.core.partition.support.SimplePartitioner;
import java.util.Collection;
@@ -33,6 +35,7 @@
*
*
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
* @since 2.1.3
*
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java
similarity index 91%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java
index 2b84033c87..104d48e995 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-package org.springframework.batch.core.partition.support;
+package org.springframework.batch.core.partition;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.partition.PartitionHandler;
-import org.springframework.batch.core.partition.StepExecutionSplitter;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.partition.support.DefaultStepExecutionAggregator;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.util.Assert;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java
similarity index 91%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java
index 2df66d1adb..5943450deb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core.partition.support;
+package org.springframework.batch.core.partition;
import java.util.Map;
@@ -28,6 +28,7 @@
*
* @author Dave Syer
* @author Taeik Lim
+ * @author Mahmoud Ben Hassine
* @since 2.0
*/
@FunctionalInterface
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java
similarity index 78%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java
index bffa64ade0..892d8df05e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2022 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -13,18 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.partition.support;
+package org.springframework.batch.core.partition;
import java.util.Collection;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
/**
- * Strategy for a aggregating step executions, usually when they are the result of
+ * Strategy for aggregating step executions, usually when they are the result of
* partitioned or remote execution.
*
* @author Dave Syer
* @author Taeik Lim
+ * @author Mahmoud Ben Hassine
* @since 2.1
*
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionSplitter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionSplitter.java
index 0b5e83f952..394effa2af 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionSplitter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionSplitter.java
@@ -16,9 +16,9 @@
package org.springframework.batch.core.partition;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.StepExecution;
import java.util.Set;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java
index 0d4538511e..0d7692eba1 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java
@@ -18,16 +18,15 @@
import java.util.Collection;
import java.util.Set;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.partition.StepExecutionSplitter;
/**
* Base {@link PartitionHandler} implementation providing common base features. Subclasses
- * are expected to implement only the
- * {@link #doHandle(org.springframework.batch.core.StepExecution, java.util.Set)} method
- * which returns with the result of the execution(s) or an exception if the step failed to
- * process.
+ * are expected to implement only the {@link #doHandle(StepExecution, java.util.Set)}
+ * method which returns with the result of the execution(s) or an exception if the step
+ * failed to process.
*
* @author Sebastien Gerard
* @author Dave Syer
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java
index 27ba91b018..1f0f4fe75b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java
@@ -18,7 +18,8 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.util.Assert;
import java.util.Collection;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java
index 32cfe6f066..6ed5de1c3a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java
@@ -20,6 +20,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java
index 8f3b5f4f59..b603017e38 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,9 +21,10 @@
import java.util.Set;
import java.util.stream.Collectors;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
+import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
@@ -38,7 +39,7 @@ public class RemoteStepExecutionAggregator implements StepExecutionAggregator, I
private StepExecutionAggregator delegate = new DefaultStepExecutionAggregator();
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
/**
* Create a new instance (useful for configuration purposes).
@@ -47,20 +48,20 @@ public RemoteStepExecutionAggregator() {
}
/**
- * Create a new instance with a job explorer that can be used to refresh the data when
- * aggregating.
- * @param jobExplorer the {@link JobExplorer} to use
+ * Create a new instance with a job repository that can be used to refresh the data
+ * when aggregating.
+ * @param jobRepository the {@link JobRepository} to use
*/
- public RemoteStepExecutionAggregator(JobExplorer jobExplorer) {
+ public RemoteStepExecutionAggregator(JobRepository jobRepository) {
super();
- this.jobExplorer = jobExplorer;
+ this.jobRepository = jobRepository;
}
/**
- * @param jobExplorer the jobExplorer to set
+ * @param jobRepository the jobRepository to set
*/
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
+ public void setJobRepository(JobRepository jobRepository) {
+ this.jobRepository = jobRepository;
}
/**
@@ -75,13 +76,13 @@ public void setDelegate(StepExecutionAggregator delegate) {
*/
@Override
public void afterPropertiesSet() throws Exception {
- Assert.state(jobExplorer != null, "A JobExplorer must be provided");
+ Assert.state(jobRepository != null, "A JobRepository must be provided");
}
/**
* Aggregates the input executions into the result {@link StepExecution} delegating to
* the delegate aggregator once the input has been refreshed from the
- * {@link JobExplorer}.
+ * {@link JobRepository}.
*
* @see StepExecutionAggregator #aggregate(StepExecution, Collection)
*/
@@ -96,7 +97,7 @@ public void aggregate(StepExecution result, Collection executions
Assert.state(id != null, "StepExecution has null id. It must be saved first: " + stepExecution);
return id;
}).collect(Collectors.toSet());
- JobExecution jobExecution = jobExplorer.getJobExecution(result.getJobExecutionId());
+ JobExecution jobExecution = jobRepository.getJobExecution(result.getJobExecutionId());
Assert.state(jobExecution != null,
"Could not load JobExecution from JobRepository for id " + result.getJobExecutionId());
List updates = jobExecution.getStepExecutions()
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java
index de0b44f7b4..6f7230225f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.item.ExecutionContext;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java
index 699e95fc12..c31f85b62f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java
@@ -24,11 +24,13 @@
import java.util.Set;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.partition.PartitionNameProvider;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.core.partition.StepExecutionSplitter;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.item.ExecutionContext;
@@ -191,9 +193,9 @@ private Map getContexts(StepExecution stepExecution, i
result = partitioner.partition(splitSize);
}
else {
- if (partitioner instanceof PartitionNameProvider) {
+ if (partitioner instanceof PartitionNameProvider partitionNameProvider) {
result = new HashMap<>();
- Collection names = ((PartitionNameProvider) partitioner).getPartitionNames(splitSize);
+ Collection names = partitionNameProvider.getPartitionNames(splitSize);
for (String name : names) {
/*
* We need to return the same keys as the original (failed) execution,
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java
index 25f55aa78c..bc0ff6d1a7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java
@@ -23,8 +23,8 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.step.StepHolder;
import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java
index a2f682896e..43384a9902 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.repository;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* @author Dave Syer
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteException.java
index 577ae8ad13..59dd702f70 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.repository;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* An exception indicating an illegal attempt to restart a job that was already completed
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
index b8db9253b2..0fbf671699 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,12 +16,14 @@
package org.springframework.batch.core.repository;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.item.ExecutionContext;
@@ -31,6 +33,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
/**
*
@@ -48,51 +51,209 @@
* @author Mahmoud Ben Hassine
* @author Parikshit Dutta
*/
-public interface JobRepository {
+@SuppressWarnings("removal")
+public interface JobRepository extends JobExplorer {
+
+ /*
+ * ===================================================================================
+ * Read operations
+ * ===================================================================================
+ */
+
+ /*
+ * ===================================================================================
+ * Job operations
+ * ===================================================================================
+ */
/**
- * Retrieve the names of all job instances sorted alphabetically - i.e. jobs that have
- * ever been executed.
- * @return the names of all job instances
- * @since 5.0
+ * Query the repository for all unique {@link JobInstance} names (sorted
+ * alphabetically).
+ * @return the list of job names that have been executed.
*/
default List getJobNames() {
return Collections.emptyList();
}
+ /*
+ * ===================================================================================
+ * Job instance operations
+ * ===================================================================================
+ */
+
/**
- * Fetch the last job instances with the provided name, sorted backwards by primary
- * key, using a 'like' criteria
- * @param jobName {@link String} containing the name of the job.
- * @param start int containing the offset of where list of job instances results
- * should begin.
- * @param count int containing the number of job instances to return.
- * @return a list of {@link JobInstance} for the job name requested.
- * @since 5.0
+ * Fetch {@link JobInstance} values in descending order of creation (and, therefore,
+ * usually, of first execution).
+ * @param jobName The name of the job to query.
+ * @param start The start index of the instances to return.
+ * @param count The maximum number of instances to return.
+ * @return the {@link JobInstance} values up to a maximum of count values.
*/
- default List findJobInstancesByName(String jobName, int start, int count) {
+ default List getJobInstances(String jobName, int start, int count) {
return Collections.emptyList();
}
/**
- * Return all {@link JobExecution}s for given {@link JobInstance}, sorted backwards by
- * creation order (so the first element is the most recent).
- * @param jobInstance parent {@link JobInstance} of the {@link JobExecution}s to find.
- * @return {@link List} containing JobExecutions for the jobInstance.
+ * @param instanceId {@link Long} The ID for the {@link JobInstance} to obtain.
+ * @return the {@code JobInstance} that has this ID, or {@code null} if not found.
+ */
+ @Nullable
+ default JobInstance getJobInstance(@Nullable Long instanceId) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Find the last job instance, by ID, for the given job.
+ * @param jobName The name of the job.
+ * @return the last job instance by Id if any or {@code null} otherwise.
+ *
+ * @since 4.2
+ */
+ @Nullable
+ default JobInstance getLastJobInstance(String jobName) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @param jobName {@link String} name of the job.
+ * @param jobParameters {@link JobParameters} parameters for the job instance.
+ * @return the {@link JobInstance} with the given name and parameters, or
+ * {@code null}.
+ *
* @since 5.0
*/
- default List findJobExecutions(JobInstance jobInstance) {
+ @Nullable
+ default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Query the repository for the number of unique {@link JobInstance} objects
+ * associated with the supplied job name.
+ * @param jobName The name of the job for which to query.
+ * @return the number of {@link JobInstance}s that exist within the associated job
+ * repository.
+ * @throws NoSuchJobException thrown when there is no {@link JobInstance} for the
+ * jobName specified.
+ */
+ default long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
+ throw new UnsupportedOperationException();
+ }
+
+ /*
+ * ===================================================================================
+ * Job execution operations
+ * ===================================================================================
+ */
+
+ /**
+ * Retrieve a {@link JobExecution} by its ID. The complete object graph for this
+ * execution should be returned (unless otherwise indicated), including the parent
+ * {@link JobInstance} and associated {@link ExecutionContext} and
+ * {@link StepExecution} instances (also including their execution contexts).
+ * @param executionId The job execution ID.
+ * @return the {@link JobExecution} that has this ID or {@code null} if not found.
+ */
+ @Nullable
+ default JobExecution getJobExecution(@Nullable Long executionId) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Retrieve job executions by their job instance. The corresponding step executions
+ * may not be fully hydrated (for example, their execution context may be missing),
+ * depending on the implementation. In that case, use
+ * {@link #getStepExecution(Long, Long)} to hydrate them.
+ * @param jobInstance The {@link JobInstance} to query.
+ * @return the list of all executions for the specified {@link JobInstance}.
+ */
+ default List getJobExecutions(JobInstance jobInstance) {
return Collections.emptyList();
}
/**
- * Check if an instance of this job already exists with the parameters provided.
- * @param jobName the name of the job
- * @param jobParameters the parameters to match
- * @return true if a {@link JobInstance} already exists for this job name and job
- * parameters
+ * Find the last {@link JobExecution} that has been created for a given
+ * {@link JobInstance}.
+ * @param jobInstance The {@code JobInstance} for which to find the last
+ * {@code JobExecution}.
+ * @return the last {@code JobExecution} that has been created for this instance or
+ * {@code null} if no job execution is found for the given job instance.
+ *
+ * @since 4.2
+ */
+ @Nullable
+ default JobExecution getLastJobExecution(JobInstance jobInstance) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @param jobName the name of the job that might have run
+ * @param jobParameters parameters identifying the {@link JobInstance}
+ * @return the last execution of job if exists, null otherwise
+ */
+ @Nullable
+ default JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Retrieve running job executions. The corresponding step executions may not be fully
+ * hydrated (for example, their execution context may be missing), depending on the
+ * implementation. In that case, use {@link #getStepExecution(Long, Long)} to hydrate
+ * them.
+ * @param jobName The name of the job.
+ * @return the set of running executions for jobs with the specified name.
+ */
+ default Set findRunningJobExecutions(@Nullable String jobName) {
+ return Collections.emptySet();
+ }
+
+ /*
+ * ===================================================================================
+ * Step execution operations
+ * ===================================================================================
+ */
+
+ /**
+ * Retrieve a {@link StepExecution} by its ID and parent {@link JobExecution} ID. The
+ * execution context for the step should be available in the result, and the parent
+ * job execution should have its primitive properties, but it may not contain the job
+ * instance information.
+ * @param jobExecutionId The parent job execution ID.
+ * @param stepExecutionId The step execution ID.
+ * @return the {@link StepExecution} that has this ID or {@code null} if not found.
+ *
+ * @see #getJobExecution(Long)
+ */
+ @Nullable
+ default StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable Long stepExecutionId) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @param jobInstance {@link JobInstance} instance containing the step executions.
+ * @param stepName the name of the step execution that might have run.
+ * @return the last execution of step for the given job instance.
+ */
+ @Nullable
+ default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @param jobInstance {@link JobInstance} instance containing the step executions.
+ * @param stepName the name of the step execution that might have run.
+ * @return the execution count of the step within the given job instance.
+ */
+ default long getStepExecutionCount(JobInstance jobInstance, String stepName) {
+ throw new UnsupportedOperationException();
+ }
+
+ /*
+ * ===================================================================================
+ * Write operations
+ * ===================================================================================
*/
- boolean isJobInstanceExists(String jobName, JobParameters jobParameters);
/**
* Create a new {@link JobInstance} with the name and job parameters provided.
@@ -187,42 +348,6 @@ JobExecution createJobExecution(String jobName, JobParameters jobParameters)
*/
void updateExecutionContext(JobExecution jobExecution);
- /**
- * @param jobName {@link String} name of the job.
- * @param jobParameters {@link JobParameters} parameters for the job instance.
- * @return the {@link JobInstance} with the given name and parameters, or
- * {@code null}.
- *
- * @since 5.0
- */
- @Nullable
- default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @param jobInstance {@link JobInstance} instance containing the step executions.
- * @param stepName the name of the step execution that might have run.
- * @return the last execution of step for the given job instance.
- */
- @Nullable
- StepExecution getLastStepExecution(JobInstance jobInstance, String stepName);
-
- /**
- * @param jobInstance {@link JobInstance} instance containing the step executions.
- * @param stepName the name of the step execution that might have run.
- * @return the execution count of the step within the given job instance.
- */
- long getStepExecutionCount(JobInstance jobInstance, String stepName);
-
- /**
- * @param jobName the name of the job that might have run
- * @param jobParameters parameters identifying the {@link JobInstance}
- * @return the last execution of job if exists, null otherwise
- */
- @Nullable
- JobExecution getLastJobExecution(String jobName, JobParameters jobParameters);
-
/**
* Delete the step execution along with its execution context.
* @param stepExecution the step execution to delete
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRestartException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRestartException.java
index 4a33ee182e..21ec468b3e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRestartException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRestartException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.repository;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* An exception indicating an illegal attempt to restart a job.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextDao.java
index c27b7b264f..53921956e4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextDao.java
@@ -18,8 +18,8 @@
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java
index 9890c09853..813a7756d5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java
@@ -55,8 +55,8 @@
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.ExecutionContextSerializer;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.Assert;
@@ -173,7 +173,8 @@ private JobParametersModule() {
addSerializer(JobParameter.class, new JobParameterSerializer(JobParameter.class));
}
- private abstract class JobParametersMixIn {
+ @SuppressWarnings("unused")
+ private abstract static class JobParametersMixIn {
@JsonIgnore
abstract boolean isEmpty();
@@ -183,7 +184,7 @@ private abstract class JobParametersMixIn {
}
- private class JobParameterSerializer extends StdSerializer {
+ private static class JobParameterSerializer extends StdSerializer {
protected JobParameterSerializer(Class type) {
super(type);
@@ -303,8 +304,9 @@ static class TrustedTypeIdResolver implements TypeIdResolver {
"java.lang.Byte", "java.lang.Short", "java.lang.Integer", "java.lang.Long", "java.lang.Double",
"java.lang.Float", "java.math.BigDecimal", "java.math.BigInteger", "java.lang.String",
"java.lang.Character", "java.lang.CharSequence", "java.util.Properties", "[Ljava.util.Properties;",
- "org.springframework.batch.core.JobParameter", "org.springframework.batch.core.JobParameters",
- "java.util.concurrent.ConcurrentHashMap", "java.sql.Date");
+ "org.springframework.batch.core.job.parameters.JobParameter",
+ "org.springframework.batch.core.job.parameters.JobParameters", "java.util.concurrent.ConcurrentHashMap",
+ "java.sql.Date");
private final Set trustedClassNames = new LinkedHashSet<>(TRUSTED_CLASS_NAMES);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
index ec8da0c7a6..4bdb677018 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Set;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
index 4c2ac43be4..581e02c00d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,9 +18,9 @@
import java.util.List;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.lang.Nullable;
@@ -117,7 +117,10 @@ default JobInstance getLastJobInstance(String jobName) {
* should begin.
* @param count int containing the number of job instances to return.
* @return a list of {@link JobInstance} for the job name requested.
+ * @deprecated Since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)}
*/
+ @Deprecated(forRemoval = true)
List findJobInstancesByName(String jobName, int start, int count);
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
index 58e43bd8ef..5bdc678471 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
@@ -18,9 +18,9 @@
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.lang.Nullable;
public interface StepExecutionDao {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcExecutionContextDao.java
similarity index 90%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcExecutionContextDao.java
index 07915965c0..e585661a80 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcExecutionContextDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.jdbc;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,21 +27,22 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Stream;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.ExecutionContextSerializer;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
+import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.core.serializer.Serializer;
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.lob.DefaultLobHandler;
-import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
@@ -57,6 +58,7 @@
* @author Michael Minella
* @author David Turanski
* @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
*/
public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implements ExecutionContextDao {
@@ -110,8 +112,6 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
private int shortContextLength = DEFAULT_MAX_VARCHAR_LENGTH;
- private LobHandler lobHandler = new DefaultLobHandler();
-
private ExecutionContextSerializer serializer = new DefaultExecutionContextSerializer();
private final Lock lock = new ReentrantLock();
@@ -154,13 +154,9 @@ public ExecutionContext getExecutionContext(JobExecution jobExecution) {
Long executionId = jobExecution.getId();
Assert.notNull(executionId, "ExecutionId must not be null.");
- List results = getJdbcTemplate().query(getQuery(FIND_JOB_EXECUTION_CONTEXT),
- new ExecutionContextRowMapper(), executionId);
- if (!results.isEmpty()) {
- return results.get(0);
- }
- else {
- return new ExecutionContext();
+ try (Stream stream = getJdbcTemplate().queryForStream(getQuery(FIND_JOB_EXECUTION_CONTEXT),
+ new ExecutionContextRowMapper(), executionId)) {
+ return stream.findFirst().orElseGet(ExecutionContext::new);
}
}
@@ -169,13 +165,9 @@ public ExecutionContext getExecutionContext(StepExecution stepExecution) {
Long executionId = stepExecution.getId();
Assert.notNull(executionId, "ExecutionId must not be null.");
- List results = getJdbcTemplate().query(getQuery(FIND_STEP_EXECUTION_CONTEXT),
- new ExecutionContextRowMapper(), executionId);
- if (results.size() > 0) {
- return results.get(0);
- }
- else {
- return new ExecutionContext();
+ try (Stream stream = getJdbcTemplate().queryForStream(getQuery(FIND_STEP_EXECUTION_CONTEXT),
+ new ExecutionContextRowMapper(), executionId)) {
+ return stream.findFirst().orElseGet(ExecutionContext::new);
}
}
@@ -268,15 +260,6 @@ public void deleteExecutionContext(StepExecution stepExecution) {
getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION_CONTEXT), stepExecution.getId());
}
- /**
- * @deprecated Since 5.2 with no replacement. Scheduled for removal in v6
- * @param lobHandler the lob handler to use
- */
- @Deprecated(since = "5.2.0", forRemoval = true)
- public void setLobHandler(LobHandler lobHandler) {
- this.lobHandler = lobHandler;
- }
-
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
@@ -306,7 +289,7 @@ private void persistSerializedContext(final Long executionId, String serializedC
getJdbcTemplate().update(getQuery(sql), ps -> {
ps.setString(1, shortContext);
if (longContext != null) {
- lobHandler.getLobCreator().setClobAsString(ps, 2, longContext);
+ ps.setString(2, longContext);
}
else {
ps.setNull(2, getClobTypeToUse());
@@ -342,7 +325,7 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
}
ps.setString(1, shortContext);
if (longContext != null) {
- lobHandler.getLobCreator().setClobAsString(ps, 2, longContext);
+ ps.setString(2, longContext);
}
else {
ps.setNull(2, getClobTypeToUse());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java
similarity index 90%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java
index 9ec0a9e2d8..012f42982f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -28,16 +28,17 @@
import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Stream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.converter.DateToStringConverter;
import org.springframework.batch.core.converter.LocalDateTimeToStringConverter;
import org.springframework.batch.core.converter.LocalDateToStringConverter;
@@ -46,6 +47,9 @@
import org.springframework.batch.core.converter.StringToLocalDateConverter;
import org.springframework.batch.core.converter.StringToLocalDateTimeConverter;
import org.springframework.batch.core.converter.StringToLocalTimeConverter;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.NoSuchObjectException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.support.ConfigurableConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
@@ -74,6 +78,7 @@
* @author Dimitrios Liapis
* @author Philippe Marschall
* @author Jinwoo Bae
+ * @author Yanming Zhou
*/
public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements JobExecutionDao, InitializingBean {
@@ -98,28 +103,22 @@ SELECT COUNT(*)
private static final String UPDATE_JOB_EXECUTION = """
UPDATE %PREFIX%JOB_EXECUTION
- SET START_TIME = ?, END_TIME = ?, STATUS = ?, EXIT_CODE = ?, EXIT_MESSAGE = ?, VERSION = ?, CREATE_TIME = ?, LAST_UPDATED = ?
+ SET START_TIME = ?, END_TIME = ?, STATUS = ?, EXIT_CODE = ?, EXIT_MESSAGE = ?, VERSION = VERSION + 1, CREATE_TIME = ?, LAST_UPDATED = ?
WHERE JOB_EXECUTION_ID = ? AND VERSION = ?
""";
- private static final String FIND_JOB_EXECUTIONS = """
+ private static final String GET_JOB_EXECUTIONS = """
SELECT JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, EXIT_CODE, EXIT_MESSAGE, CREATE_TIME, LAST_UPDATED, VERSION
FROM %PREFIX%JOB_EXECUTION
- WHERE JOB_INSTANCE_ID = ?
- ORDER BY JOB_EXECUTION_ID DESC
""";
- private static final String GET_LAST_EXECUTION = """
- SELECT JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, EXIT_CODE, EXIT_MESSAGE, CREATE_TIME, LAST_UPDATED, VERSION
- FROM %PREFIX%JOB_EXECUTION E
- WHERE JOB_INSTANCE_ID = ? AND JOB_EXECUTION_ID IN (SELECT MAX(JOB_EXECUTION_ID) FROM %PREFIX%JOB_EXECUTION E2 WHERE E2.JOB_INSTANCE_ID = ?)
- """;
+ private static final String FIND_JOB_EXECUTIONS = GET_JOB_EXECUTIONS
+ + " WHERE JOB_INSTANCE_ID = ? ORDER BY JOB_EXECUTION_ID DESC";
- private static final String GET_EXECUTION_BY_ID = """
- SELECT JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, EXIT_CODE, EXIT_MESSAGE, CREATE_TIME, LAST_UPDATED, VERSION
- FROM %PREFIX%JOB_EXECUTION
- WHERE JOB_EXECUTION_ID = ?
- """;
+ private static final String GET_LAST_EXECUTION = GET_JOB_EXECUTIONS
+ + " WHERE JOB_INSTANCE_ID = ? AND JOB_EXECUTION_ID IN (SELECT MAX(JOB_EXECUTION_ID) FROM %PREFIX%JOB_EXECUTION E2 WHERE E2.JOB_INSTANCE_ID = ?)";
+
+ private static final String GET_EXECUTION_BY_ID = GET_JOB_EXECUTIONS + " WHERE JOB_EXECUTION_ID = ?";
private static final String GET_RUNNING_EXECUTIONS = """
SELECT E.JOB_EXECUTION_ID, E.START_TIME, E.END_TIME, E.STATUS, E.EXIT_CODE, E.EXIT_MESSAGE, E.CREATE_TIME, E.LAST_UPDATED, E.VERSION, E.JOB_INSTANCE_ID
@@ -146,7 +145,7 @@ SELECT COUNT(*)
private static final String DELETE_JOB_EXECUTION = """
DELETE FROM %PREFIX%JOB_EXECUTION
- WHERE JOB_EXECUTION_ID = ?
+ WHERE JOB_EXECUTION_ID = ? AND VERSION = ?
""";
private static final String DELETE_JOB_EXECUTION_PARAMETERS = """
@@ -284,7 +283,6 @@ public void updateJobExecution(JobExecution jobExecution) {
this.lock.lock();
try {
- Integer version = jobExecution.getVersion() + 1;
String exitDescription = jobExecution.getExitStatus().getExitDescription();
if (exitDescription != null && exitDescription.length() > exitMessageLength) {
@@ -301,7 +299,7 @@ public void updateJobExecution(JobExecution jobExecution) {
Timestamp lastUpdated = jobExecution.getLastUpdated() == null ? null
: Timestamp.valueOf(jobExecution.getLastUpdated());
Object[] parameters = new Object[] { startTime, endTime, jobExecution.getStatus().toString(),
- jobExecution.getExitStatus().getExitCode(), exitDescription, version, createTime, lastUpdated,
+ jobExecution.getExitStatus().getExitCode(), exitDescription, createTime, lastUpdated,
jobExecution.getId(), jobExecution.getVersion() };
// Check if given JobExecution's Id already exists, if none is found
@@ -315,7 +313,7 @@ public void updateJobExecution(JobExecution jobExecution) {
int count = getJdbcTemplate().update(getQuery(UPDATE_JOB_EXECUTION), parameters,
new int[] { Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR,
- Types.INTEGER, Types.TIMESTAMP, Types.TIMESTAMP, Types.BIGINT, Types.INTEGER });
+ Types.TIMESTAMP, Types.TIMESTAMP, Types.BIGINT, Types.INTEGER });
// Avoid concurrent modifications...
if (count == 0) {
@@ -339,16 +337,9 @@ public JobExecution getLastJobExecution(JobInstance jobInstance) {
Long id = jobInstance.getId();
- List executions = getJdbcTemplate().query(getQuery(GET_LAST_EXECUTION),
- new JobExecutionRowMapper(jobInstance), id, id);
-
- Assert.state(executions.size() <= 1, "There must be at most one latest job execution");
-
- if (executions.isEmpty()) {
- return null;
- }
- else {
- return executions.get(0);
+ try (Stream stream = getJdbcTemplate().queryForStream(getQuery(GET_LAST_EXECUTION),
+ new JobExecutionRowMapper(jobInstance), id, id)) {
+ return stream.findFirst().orElse(null);
}
}
@@ -395,7 +386,13 @@ public void synchronizeStatus(JobExecution jobExecution) {
*/
@Override
public void deleteJobExecution(JobExecution jobExecution) {
- getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION), jobExecution.getId());
+ int count = getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION), jobExecution.getId(),
+ jobExecution.getVersion());
+
+ if (count == 0) {
+ throw new OptimisticLockingFailureException("Attempt to delete job execution id=" + jobExecution.getId()
+ + " with wrong version (" + jobExecution.getVersion() + ")");
+ }
}
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobInstanceDao.java
similarity index 79%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobInstanceDao.java
index 27dcc8b7a2..6e39d21584 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobInstanceDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,23 +14,27 @@
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.jdbc;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Stream;
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobKeyGenerator;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobKeyGenerator;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
@@ -53,11 +57,14 @@
* @author Will Schipp
* @author Mahmoud Ben Hassine
* @author Parikshit Dutta
+ * @author Yanming Zhou
*/
public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements JobInstanceDao, InitializingBean {
+ @SuppressWarnings("unused")
private static final String STAR_WILDCARD = "*";
+ @SuppressWarnings("unused")
private static final String SQL_WILDCARD = "%";
private static final String CREATE_JOB_INSTANCE = """
@@ -71,7 +78,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
WHERE JOB_NAME = ?
""";
- private static final String FIND_JOBS_WITH_KEY = FIND_JOBS_WITH_NAME + " and JOB_KEY = ?";
+ private static final String FIND_JOBS_WITH_KEY = FIND_JOBS_WITH_NAME + " AND JOB_KEY = ?";
private static final String COUNT_JOBS_WITH_NAME = """
SELECT COUNT(*)
@@ -79,11 +86,8 @@ SELECT COUNT(*)
WHERE JOB_NAME = ?
""";
- private static final String FIND_JOBS_WITH_EMPTY_KEY = """
- SELECT JOB_INSTANCE_ID, JOB_NAME
- FROM %PREFIX%JOB_INSTANCE
- WHERE JOB_NAME = ? AND (JOB_KEY = ? OR JOB_KEY IS NULL)
- """;
+ private static final String FIND_JOBS_WITH_EMPTY_KEY = FIND_JOBS_WITH_NAME
+ + " AND (JOB_KEY = ? OR JOB_KEY IS NULL)";
private static final String GET_JOB_FROM_ID = """
SELECT JOB_INSTANCE_ID, JOB_NAME, JOB_KEY, VERSION
@@ -106,7 +110,7 @@ SELECT COUNT(*)
private static final String FIND_LAST_JOBS_BY_NAME = """
SELECT JOB_INSTANCE_ID, JOB_NAME
FROM %PREFIX%JOB_INSTANCE
- WHERE JOB_NAME = ?
+ WHERE JOB_NAME LIKE ?
ORDER BY JOB_INSTANCE_ID DESC
""";
@@ -116,20 +120,14 @@ SELECT COUNT(*)
WHERE I1.JOB_NAME = ? AND I1.JOB_INSTANCE_ID = (SELECT MAX(I2.JOB_INSTANCE_ID) FROM %PREFIX%JOB_INSTANCE I2 WHERE I2.JOB_NAME = ?)
""";
- private static final String FIND_LAST_JOBS_LIKE_NAME = """
- SELECT JOB_INSTANCE_ID, JOB_NAME
- FROM %PREFIX%JOB_INSTANCE
- WHERE JOB_NAME LIKE ? ORDER BY JOB_INSTANCE_ID DESC
- """;
-
private static final String DELETE_JOB_INSTANCE = """
DELETE FROM %PREFIX%JOB_INSTANCE
- WHERE JOB_INSTANCE_ID = ?
+ WHERE JOB_INSTANCE_ID = ? AND VERSION = ?
""";
private DataFieldMaxValueIncrementer jobInstanceIncrementer;
- private JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
+ private JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
/**
* In this JDBC implementation a job instance id is obtained by asking the
@@ -178,21 +176,12 @@ public JobInstance getJobInstance(final String jobName, final JobParameters jobP
RowMapper rowMapper = new JobInstanceRowMapper();
- List instances;
- if (StringUtils.hasLength(jobKey)) {
- instances = getJdbcTemplate().query(getQuery(FIND_JOBS_WITH_KEY), rowMapper, jobName, jobKey);
- }
- else {
- instances = getJdbcTemplate().query(getQuery(FIND_JOBS_WITH_EMPTY_KEY), rowMapper, jobName, jobKey);
+ try (Stream stream = getJdbcTemplate().queryForStream(
+ getQuery(StringUtils.hasLength(jobKey) ? FIND_JOBS_WITH_KEY : FIND_JOBS_WITH_EMPTY_KEY), rowMapper,
+ jobName, jobKey)) {
+ return stream.findFirst().orElse(null);
}
- if (instances.isEmpty()) {
- return null;
- }
- else {
- Assert.state(instances.size() == 1, "instance count must be 1 but was " + instances.size());
- return instances.get(0);
- }
}
@Override
@@ -236,6 +225,10 @@ public List extractData(ResultSet rs) throws SQLException, DataAcce
};
+ if (jobName.contains(STAR_WILDCARD)) {
+ jobName = jobName.replaceAll("\\" + STAR_WILDCARD, SQL_WILDCARD);
+ }
+
return getJdbcTemplate().query(getQuery(FIND_LAST_JOBS_BY_NAME), extractor, jobName);
}
@@ -281,18 +274,13 @@ public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobExcept
*/
@Override
public void deleteJobInstance(JobInstance jobInstance) {
- getJdbcTemplate().update(getQuery(DELETE_JOB_INSTANCE), jobInstance.getId());
- }
+ int count = getJdbcTemplate().update(getQuery(DELETE_JOB_INSTANCE), jobInstance.getId(),
+ jobInstance.getVersion());
- /**
- * Setter for {@link DataFieldMaxValueIncrementer} to be used when generating primary
- * keys for {@link JobInstance} instances.
- * @param jobIncrementer the {@link DataFieldMaxValueIncrementer}
- * @deprecated as of v5.0 in favor of using the {@link #setJobInstanceIncrementer}
- */
- @Deprecated
- public void setJobIncrementer(DataFieldMaxValueIncrementer jobIncrementer) {
- this.setJobInstanceIncrementer(jobIncrementer);
+ if (count == 0) {
+ throw new OptimisticLockingFailureException("Attempt to delete job instance id=" + jobInstance.getId()
+ + " with wrong version (" + jobInstance.getVersion() + ")");
+ }
}
/**
@@ -343,33 +331,15 @@ public JobInstance mapRow(ResultSet rs, int rowNum) throws SQLException {
}
+ /**
+ * @deprecated since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)} instead.
+ */
+ @SuppressWarnings("removal")
+ @Deprecated(forRemoval = true)
@Override
- @SuppressWarnings({ "rawtypes", "unchecked" })
public List findJobInstancesByName(String jobName, final int start, final int count) {
- ResultSetExtractor extractor = new ResultSetExtractor() {
- private final List list = new ArrayList<>();
-
- @Override
- public Object extractData(ResultSet rs) throws SQLException, DataAccessException {
- int rowNum = 0;
- while (rowNum < start && rs.next()) {
- rowNum++;
- }
- while (rowNum < start + count && rs.next()) {
- RowMapper rowMapper = new JobInstanceRowMapper();
- list.add(rowMapper.mapRow(rs, rowNum));
- rowNum++;
- }
- return list;
- }
- };
-
- if (jobName.contains(STAR_WILDCARD)) {
- jobName = jobName.replaceAll("\\" + STAR_WILDCARD, SQL_WILDCARD);
- }
-
- return (List) getJdbcTemplate().query(getQuery(FIND_LAST_JOBS_LIKE_NAME), extractor, jobName);
-
+ return getJobInstances(jobName, start, count);
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java
similarity index 91%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java
index b1e46e0c23..a9c910eb09 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -29,15 +29,18 @@
import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Stream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
@@ -66,6 +69,7 @@
* @author Mahmoud Ben Hassine
* @author Baris Cubukcuoglu
* @author Minsoo Kim
+ * @author Yanming Zhou
* @see StepExecutionDao
*/
public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implements StepExecutionDao, InitializingBean {
@@ -79,19 +83,19 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
private static final String UPDATE_STEP_EXECUTION = """
UPDATE %PREFIX%STEP_EXECUTION
- SET START_TIME = ?, END_TIME = ?, STATUS = ?, COMMIT_COUNT = ?, READ_COUNT = ?, FILTER_COUNT = ?, WRITE_COUNT = ?, EXIT_CODE = ?, EXIT_MESSAGE = ?, VERSION = ?, READ_SKIP_COUNT = ?, PROCESS_SKIP_COUNT = ?, WRITE_SKIP_COUNT = ?, ROLLBACK_COUNT = ?, LAST_UPDATED = ?
+ SET START_TIME = ?, END_TIME = ?, STATUS = ?, COMMIT_COUNT = ?, READ_COUNT = ?, FILTER_COUNT = ?, WRITE_COUNT = ?, EXIT_CODE = ?, EXIT_MESSAGE = ?, VERSION = VERSION + 1, READ_SKIP_COUNT = ?, PROCESS_SKIP_COUNT = ?, WRITE_SKIP_COUNT = ?, ROLLBACK_COUNT = ?, LAST_UPDATED = ?
WHERE STEP_EXECUTION_ID = ? AND VERSION = ?
""";
private static final String GET_RAW_STEP_EXECUTIONS = """
SELECT STEP_EXECUTION_ID, STEP_NAME, START_TIME, END_TIME, STATUS, COMMIT_COUNT, READ_COUNT, FILTER_COUNT, WRITE_COUNT, EXIT_CODE, EXIT_MESSAGE, READ_SKIP_COUNT, WRITE_SKIP_COUNT, PROCESS_SKIP_COUNT, ROLLBACK_COUNT, LAST_UPDATED, VERSION, CREATE_TIME
FROM %PREFIX%STEP_EXECUTION
- WHERE JOB_EXECUTION_ID = ?
""";
- private static final String GET_STEP_EXECUTIONS = GET_RAW_STEP_EXECUTIONS + " ORDER BY STEP_EXECUTION_ID";
+ private static final String GET_STEP_EXECUTIONS = GET_RAW_STEP_EXECUTIONS
+ + " WHERE JOB_EXECUTION_ID = ? ORDER BY STEP_EXECUTION_ID";
- private static final String GET_STEP_EXECUTION = GET_RAW_STEP_EXECUTIONS + " AND STEP_EXECUTION_ID = ?";
+ private static final String GET_STEP_EXECUTION = GET_RAW_STEP_EXECUTIONS + " WHERE STEP_EXECUTION_ID = ?";
private static final String GET_LAST_STEP_EXECUTION = """
SELECT SE.STEP_EXECUTION_ID, SE.STEP_NAME, SE.START_TIME, SE.END_TIME, SE.STATUS, SE.COMMIT_COUNT, SE.READ_COUNT, SE.FILTER_COUNT, SE.WRITE_COUNT, SE.EXIT_CODE, SE.EXIT_MESSAGE, SE.READ_SKIP_COUNT, SE.WRITE_SKIP_COUNT, SE.PROCESS_SKIP_COUNT, SE.ROLLBACK_COUNT, SE.LAST_UPDATED, SE.VERSION, SE.CREATE_TIME, JE.JOB_EXECUTION_ID, JE.START_TIME, JE.END_TIME, JE.STATUS, JE.EXIT_CODE, JE.EXIT_MESSAGE, JE.CREATE_TIME, JE.LAST_UPDATED, JE.VERSION
@@ -114,7 +118,7 @@ SELECT COUNT(*)
private static final String DELETE_STEP_EXECUTION = """
DELETE FROM %PREFIX%STEP_EXECUTION
- WHERE STEP_EXECUTION_ID = ?
+ WHERE STEP_EXECUTION_ID = ? and VERSION = ?
""";
private static final Comparator BY_CREATE_TIME_DESC_ID_DESC = Comparator
@@ -267,7 +271,6 @@ public void updateStepExecution(StepExecution stepExecution) {
this.lock.lock();
try {
- Integer version = stepExecution.getVersion() + 1;
Timestamp startTime = stepExecution.getStartTime() == null ? null
: Timestamp.valueOf(stepExecution.getStartTime());
Timestamp endTime = stepExecution.getEndTime() == null ? null
@@ -277,13 +280,13 @@ public void updateStepExecution(StepExecution stepExecution) {
Object[] parameters = new Object[] { startTime, endTime, stepExecution.getStatus().toString(),
stepExecution.getCommitCount(), stepExecution.getReadCount(), stepExecution.getFilterCount(),
stepExecution.getWriteCount(), stepExecution.getExitStatus().getExitCode(), exitDescription,
- version, stepExecution.getReadSkipCount(), stepExecution.getProcessSkipCount(),
+ stepExecution.getReadSkipCount(), stepExecution.getProcessSkipCount(),
stepExecution.getWriteSkipCount(), stepExecution.getRollbackCount(), lastUpdated,
stepExecution.getId(), stepExecution.getVersion() };
int count = getJdbcTemplate().update(getQuery(UPDATE_STEP_EXECUTION), parameters,
new int[] { Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.BIGINT, Types.BIGINT,
- Types.BIGINT, Types.BIGINT, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.BIGINT,
- Types.BIGINT, Types.BIGINT, Types.BIGINT, Types.TIMESTAMP, Types.BIGINT, Types.INTEGER });
+ Types.BIGINT, Types.BIGINT, Types.VARCHAR, Types.VARCHAR, Types.BIGINT, Types.BIGINT,
+ Types.BIGINT, Types.BIGINT, Types.TIMESTAMP, Types.BIGINT, Types.INTEGER });
// Avoid concurrent modifications...
if (count == 0) {
@@ -324,16 +327,9 @@ private String truncateExitDescription(String description) {
@Override
@Nullable
public StepExecution getStepExecution(JobExecution jobExecution, Long stepExecutionId) {
- List executions = getJdbcTemplate().query(getQuery(GET_STEP_EXECUTION),
- new StepExecutionRowMapper(jobExecution), jobExecution.getId(), stepExecutionId);
-
- Assert.state(executions.size() <= 1,
- "There can be at most one step execution with given name for single job execution");
- if (executions.isEmpty()) {
- return null;
- }
- else {
- return executions.get(0);
+ try (Stream stream = getJdbcTemplate().queryForStream(getQuery(GET_STEP_EXECUTION),
+ new StepExecutionRowMapper(jobExecution), stepExecutionId)) {
+ return stream.findFirst().orElse(null);
}
}
@@ -378,7 +374,13 @@ public long countStepExecutions(JobInstance jobInstance, String stepName) {
*/
@Override
public void deleteStepExecution(StepExecution stepExecution) {
- getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION), stepExecution.getId());
+ int count = getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION), stepExecution.getId(),
+ stepExecution.getVersion());
+
+ if (count == 0) {
+ throw new OptimisticLockingFailureException("Attempt to delete step execution id=" + stepExecution.getId()
+ + " with wrong version (" + stepExecution.getVersion() + ")");
+ }
}
private static class StepExecutionRowMapper implements RowMapper {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoExecutionContextDao.java
similarity index 93%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoExecutionContextDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoExecutionContextDao.java
index 7b3e80294b..ce61e8b8d2 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoExecutionContextDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.mongodb;
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java
index da1d81ff78..d95c8d9105 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java
@@ -13,14 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.mongodb;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.persistence.converter.JobExecutionConverter;
import org.springframework.batch.core.repository.persistence.converter.JobInstanceConverter;
import org.springframework.data.domain.Sort;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobInstanceDao.java
similarity index 84%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobInstanceDao.java
index b967e35f77..2d742aa9e6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobInstanceDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.mongodb;
import java.util.List;
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobKeyGenerator;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobKeyGenerator;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.persistence.converter.JobInstanceConverter;
-import org.springframework.data.domain.Example;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
@@ -48,7 +48,7 @@ public class MongoJobInstanceDao implements JobInstanceDao {
private DataFieldMaxValueIncrementer jobInstanceIncrementer;
- private JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
+ private JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
private final JobInstanceConverter jobInstanceConverter = new JobInstanceConverter();
@@ -58,7 +58,7 @@ public MongoJobInstanceDao(MongoOperations mongoOperations) {
this.jobInstanceIncrementer = new MongoSequenceIncrementer(mongoOperations, SEQUENCE_NAME);
}
- public void setJobKeyGenerator(JobKeyGenerator jobKeyGenerator) {
+ public void setJobKeyGenerator(JobKeyGenerator jobKeyGenerator) {
this.jobKeyGenerator = jobKeyGenerator;
}
@@ -143,20 +143,15 @@ public List getJobNames() {
.toList();
}
+ /**
+ * @deprecated since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)} instead.
+ */
+ @SuppressWarnings("removal")
+ @Deprecated(forRemoval = true)
@Override
public List findJobInstancesByName(String jobName, int start, int count) {
- Query query = query(where("jobName").alike(Example.of(jobName)));
- Sort.Order sortOrder = Sort.Order.desc("jobInstanceId");
- List jobInstances = this.mongoOperations
- .find(query.with(Sort.by(sortOrder)),
- org.springframework.batch.core.repository.persistence.JobInstance.class, COLLECTION_NAME)
- .stream()
- .toList();
- return jobInstances.subList(start, jobInstances.size())
- .stream()
- .map(this.jobInstanceConverter::toJobInstance)
- .limit(count)
- .toList();
+ return getJobInstances(jobName, start, count);
}
@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoSequenceIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoSequenceIncrementer.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoSequenceIncrementer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoSequenceIncrementer.java
index db78dc343a..9722db637f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoSequenceIncrementer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoSequenceIncrementer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.mongodb;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
index ec9067fe61..a7bac8ce26 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.repository.dao;
+package org.springframework.batch.core.repository.dao.mongodb;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,9 +21,10 @@
import java.util.List;
import java.util.Optional;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
import org.springframework.batch.core.repository.persistence.converter.JobExecutionConverter;
import org.springframework.batch.core.repository.persistence.converter.StepExecutionConverter;
import org.springframework.data.mongodb.core.MongoOperations;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/JobExplorer.java
similarity index 50%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/JobExplorer.java
index 85c69655f9..aae7366d76 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/JobExplorer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,16 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.explore;
+package org.springframework.batch.core.repository.explore;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.lang.Nullable;
@@ -37,9 +39,33 @@
* @author Mahmoud Ben Hassine
* @author Parikshit Dutta
* @since 2.0
+ * @deprecated since 6.0 in favor of {@link JobRepository}. Scheduled for removal in 6.2
+ * or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public interface JobExplorer {
+ /*
+ * ===================================================================================
+ * Job operations
+ * ===================================================================================
+ */
+
+ /**
+ * Query the repository for all unique {@link JobInstance} names (sorted
+ * alphabetically).
+ * @return the list of job names that have been executed.
+ */
+ default List getJobNames() {
+ return Collections.emptyList();
+ }
+
+ /*
+ * ===================================================================================
+ * Job instance operations
+ * ===================================================================================
+ */
+
/**
* Fetch {@link JobInstance} values in descending order of creation (and, therefore,
* usually, of first execution).
@@ -48,51 +74,77 @@ public interface JobExplorer {
* @param count The maximum number of instances to return.
* @return the {@link JobInstance} values up to a maximum of count values.
*/
- List getJobInstances(String jobName, int start, int count);
+ default List getJobInstances(String jobName, int start, int count) {
+ return Collections.emptyList();
+ }
/**
- * Find the last job instance, by ID, for the given job.
- * @param jobName The name of the job.
- * @return the last job instance by Id if any or {@code null} otherwise.
- *
- * @since 4.2
+ * Fetch {@link JobInstance} values in descending order of creation (and, therefore,
+ * usually of first execution) with a 'like' or wildcard criteria.
+ * @param jobName The name of the job for which to query.
+ * @param start The start index of the instances to return.
+ * @param count The maximum number of instances to return.
+ * @return a list of {@link JobInstance} for the requested job name.
+ * @deprecated Since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)}
*/
- @Nullable
- default JobInstance getLastJobInstance(String jobName) {
- throw new UnsupportedOperationException();
+ @Deprecated(since = "6.0", forRemoval = true)
+ default List findJobInstancesByJobName(String jobName, int start, int count) {
+ return Collections.emptyList();
}
/**
- * Retrieve a {@link JobExecution} by its ID. The complete object graph for this
- * execution should be returned (unless otherwise indicated), including the parent
- * {@link JobInstance} and associated {@link ExecutionContext} and
- * {@link StepExecution} instances (also including their execution contexts).
- * @param executionId The job execution ID.
- * @return the {@link JobExecution} that has this ID or {@code null} if not found.
+ * Fetch the last job instances with the provided name, sorted backwards by primary
+ * key, using a 'like' criteria
+ * @param jobName {@link String} containing the name of the job.
+ * @param start int containing the offset of where list of job instances results
+ * should begin.
+ * @param count int containing the number of job instances to return.
+ * @return a list of {@link JobInstance} for the job name requested.
+ * @since 5.0
+ * @deprecated since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)}
*/
- @Nullable
- JobExecution getJobExecution(@Nullable Long executionId);
+ @Deprecated(since = "6.0", forRemoval = true)
+ default List findJobInstancesByName(String jobName, int start, int count) {
+ return Collections.emptyList();
+ }
/**
- * Retrieve a {@link StepExecution} by its ID and parent {@link JobExecution} ID. The
- * execution context for the step should be available in the result, and the parent
- * job execution should have its primitive properties, but it may not contain the job
- * instance information.
- * @param jobExecutionId The parent job execution ID.
- * @param stepExecutionId The step execution ID.
- * @return the {@link StepExecution} that has this ID or {@code null} if not found.
- *
- * @see #getJobExecution(Long)
+ * Check if an instance of this job already exists with the parameters provided.
+ * @param jobName the name of the job
+ * @param jobParameters the parameters to match
+ * @return true if a {@link JobInstance} already exists for this job name and job
+ * parameters
+ * @deprecated Since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstance(String, JobParameters)} and check for {@code null} result
+ * instead.
*/
- @Nullable
- StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable Long stepExecutionId);
+ @Deprecated(since = "6.0", forRemoval = true)
+ default boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
+ return getJobInstance(jobName, jobParameters) != null;
+ }
/**
* @param instanceId {@link Long} The ID for the {@link JobInstance} to obtain.
* @return the {@code JobInstance} that has this ID, or {@code null} if not found.
*/
@Nullable
- JobInstance getJobInstance(@Nullable Long instanceId);
+ default JobInstance getJobInstance(@Nullable Long instanceId) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Find the last job instance, by ID, for the given job.
+ * @param jobName The name of the job.
+ * @return the last job instance by Id if any or {@code null} otherwise.
+ *
+ * @since 4.2
+ */
+ @Nullable
+ default JobInstance getLastJobInstance(String jobName) {
+ throw new UnsupportedOperationException();
+ }
/**
* @param jobName {@link String} name of the job.
@@ -107,6 +159,38 @@ default JobInstance getJobInstance(String jobName, JobParameters jobParameters)
throw new UnsupportedOperationException();
}
+ /**
+ * Query the repository for the number of unique {@link JobInstance} objects
+ * associated with the supplied job name.
+ * @param jobName The name of the job for which to query.
+ * @return the number of {@link JobInstance}s that exist within the associated job
+ * repository.
+ * @throws NoSuchJobException thrown when there is no {@link JobInstance} for the
+ * jobName specified.
+ */
+ default long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
+ throw new UnsupportedOperationException();
+ }
+
+ /*
+ * ===================================================================================
+ * Job execution operations
+ * ===================================================================================
+ */
+
+ /**
+ * Retrieve a {@link JobExecution} by its ID. The complete object graph for this
+ * execution should be returned (unless otherwise indicated), including the parent
+ * {@link JobInstance} and associated {@link ExecutionContext} and
+ * {@link StepExecution} instances (also including their execution contexts).
+ * @param executionId The job execution ID.
+ * @return the {@link JobExecution} that has this ID or {@code null} if not found.
+ */
+ @Nullable
+ default JobExecution getJobExecution(@Nullable Long executionId) {
+ throw new UnsupportedOperationException();
+ }
+
/**
* Retrieve job executions by their job instance. The corresponding step executions
* may not be fully hydrated (for example, their execution context may be missing),
@@ -115,7 +199,23 @@ default JobInstance getJobInstance(String jobName, JobParameters jobParameters)
* @param jobInstance The {@link JobInstance} to query.
* @return the list of all executions for the specified {@link JobInstance}.
*/
- List getJobExecutions(JobInstance jobInstance);
+ default List getJobExecutions(JobInstance jobInstance) {
+ return Collections.emptyList();
+ }
+
+ /**
+ * Return all {@link JobExecution}s for given {@link JobInstance}, sorted backwards by
+ * creation order (so the first element is the most recent).
+ * @param jobInstance parent {@link JobInstance} of the {@link JobExecution}s to find.
+ * @return {@link List} containing JobExecutions for the jobInstance.
+ * @since 5.0
+ * @deprecated since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobExecutions(JobInstance)}
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ default List findJobExecutions(JobInstance jobInstance) {
+ return Collections.emptyList();
+ }
/**
* Find the last {@link JobExecution} that has been created for a given
@@ -132,6 +232,16 @@ default JobExecution getLastJobExecution(JobInstance jobInstance) {
throw new UnsupportedOperationException();
}
+ /**
+ * @param jobName the name of the job that might have run
+ * @param jobParameters parameters identifying the {@link JobInstance}
+ * @return the last execution of job if exists, null otherwise
+ */
+ @Nullable
+ default JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
+ throw new UnsupportedOperationException();
+ }
+
/**
* Retrieve running job executions. The corresponding step executions may not be fully
* hydrated (for example, their execution context may be missing), depending on the
@@ -140,34 +250,49 @@ default JobExecution getLastJobExecution(JobInstance jobInstance) {
* @param jobName The name of the job.
* @return the set of running executions for jobs with the specified name.
*/
- Set findRunningJobExecutions(@Nullable String jobName);
+ default Set findRunningJobExecutions(@Nullable String jobName) {
+ return Collections.emptySet();
+ }
+
+ /*
+ * ===================================================================================
+ * Step execution operations
+ * ===================================================================================
+ */
/**
- * Query the repository for all unique {@link JobInstance} names (sorted
- * alphabetically).
- * @return the list of job names that have been executed.
+ * Retrieve a {@link StepExecution} by its ID and parent {@link JobExecution} ID. The
+ * execution context for the step should be available in the result, and the parent
+ * job execution should have its primitive properties, but it may not contain the job
+ * instance information.
+ * @param jobExecutionId The parent job execution ID.
+ * @param stepExecutionId The step execution ID.
+ * @return the {@link StepExecution} that has this ID or {@code null} if not found.
+ *
+ * @see #getJobExecution(Long)
*/
- List getJobNames();
+ @Nullable
+ default StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable Long stepExecutionId) {
+ throw new UnsupportedOperationException();
+ }
/**
- * Fetch {@link JobInstance} values in descending order of creation (and, therefore,
- * usually of first execution) with a 'like' or wildcard criteria.
- * @param jobName The name of the job for which to query.
- * @param start The start index of the instances to return.
- * @param count The maximum number of instances to return.
- * @return a list of {@link JobInstance} for the requested job name.
+ * @param jobInstance {@link JobInstance} instance containing the step executions.
+ * @param stepName the name of the step execution that might have run.
+ * @return the last execution of step for the given job instance.
*/
- List findJobInstancesByJobName(String jobName, int start, int count);
+ @Nullable
+ default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+ throw new UnsupportedOperationException();
+ }
/**
- * Query the repository for the number of unique {@link JobInstance} objects
- * associated with the supplied job name.
- * @param jobName The name of the job for which to query.
- * @return the number of {@link JobInstance}s that exist within the associated job
- * repository.
- * @throws NoSuchJobException thrown when there is no {@link JobInstance} for the
- * jobName specified.
+ * @param jobInstance {@link JobInstance} instance containing the step executions.
+ * @param stepName the name of the step execution that might have run.
+ * @return the execution count of the step within the given job instance.
*/
- long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException;
+ default long getStepExecutionCount(JobInstance jobInstance, String stepName) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/package-info.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/package-info.java
similarity index 76%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/package-info.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/package-info.java
index b5671f50be..c759d4d869 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/package-info.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/package-info.java
@@ -5,6 +5,6 @@
* @author Mahmoud Ben Hassine
*/
@NonNullApi
-package org.springframework.batch.core.explore;
+package org.springframework.batch.core.repository.explore;
import org.springframework.lang.NonNullApi;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/AbstractJobExplorerFactoryBean.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/AbstractJobExplorerFactoryBean.java
index 8f6ae2052c..1b8627688b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/AbstractJobExplorerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.batch.core.explore.support;
+package org.springframework.batch.core.repository.explore.support;
import java.util.Properties;
import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
@@ -43,7 +43,9 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.0
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public abstract class AbstractJobExplorerFactoryBean implements FactoryBean, InitializingBean {
private static final String TRANSACTION_ISOLATION_LEVEL_PREFIX = "ISOLATION_";
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JdbcJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JdbcJobExplorerFactoryBean.java
new file mode 100644
index 0000000000..495fff19e3
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JdbcJobExplorerFactoryBean.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.batch.core.repository.explore.support;
+
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A {@link FactoryBean} that automates the creation of a {@link SimpleJobExplorer} by
+ * using JDBC DAO implementations. Requires the user to describe what kind of database
+ * they use.
+ *
+ * @author Dave Syer
+ * @author Mahmoud Ben Hassine
+ * @deprecated since 6.0 in favor of {@link JdbcJobRepositoryFactoryBean}. Scheduled for
+ * removal in 6.2 or later.
+ */
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
+public class JdbcJobExplorerFactoryBean extends JobExplorerFactoryBean {
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JobExplorerFactoryBean.java
similarity index 82%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JobExplorerFactoryBean.java
index 9d3e24dae5..98da269d85 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JobExplorerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.batch.core.explore.support;
+package org.springframework.batch.core.repository.explore.support;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import javax.sql.DataSource;
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobKeyGenerator;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobKeyGenerator;
import org.springframework.batch.core.converter.DateToStringConverter;
import org.springframework.batch.core.converter.LocalDateTimeToStringConverter;
import org.springframework.batch.core.converter.LocalDateToStringConverter;
@@ -35,14 +35,14 @@
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
-import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
-import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
-import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
-import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobInstanceDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.dao.StepExecutionDao;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.support.ConfigurableConversionService;
@@ -51,7 +51,6 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
-import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
@@ -63,31 +62,32 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.0
+ * @deprecated since 6.0 in favor of {@link JdbcJobRepositoryFactoryBean}. Scheduled for
+ * removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class JobExplorerFactoryBean extends AbstractJobExplorerFactoryBean implements InitializingBean {
- private DataSource dataSource;
+ protected DataSource dataSource;
- private JdbcOperations jdbcOperations;
+ protected JdbcOperations jdbcOperations;
- private String tablePrefix = AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
+ protected String tablePrefix = AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
- private final DataFieldMaxValueIncrementer incrementer = new AbstractDataFieldMaxValueIncrementer() {
+ protected final DataFieldMaxValueIncrementer incrementer = new AbstractDataFieldMaxValueIncrementer() {
@Override
protected long getNextKey() {
throw new IllegalStateException("JobExplorer is read only.");
}
};
- private JobKeyGenerator jobKeyGenerator;
+ protected JobKeyGenerator jobKeyGenerator;
- private LobHandler lobHandler;
+ protected ExecutionContextSerializer serializer;
- private ExecutionContextSerializer serializer;
+ protected Charset charset = StandardCharsets.UTF_8;
- private Charset charset = StandardCharsets.UTF_8;
-
- private ConfigurableConversionService conversionService;
+ protected ConfigurableConversionService conversionService;
/**
* A custom implementation of {@link ExecutionContextSerializer}. The default, if not
@@ -138,18 +138,6 @@ public void setJobKeyGenerator(JobKeyGenerator jobKeyGenerator) {
this.jobKeyGenerator = jobKeyGenerator;
}
- /**
- * The lob handler to use when saving {@link ExecutionContext} instances. Defaults to
- * {@code null}, which works for most databases.
- * @param lobHandler Large object handler for saving an
- * {@link org.springframework.batch.item.ExecutionContext}.
- * @deprecated Since 5.2 with no replacement. Scheduled for removal in v6
- */
- @Deprecated(since = "5.2.0", forRemoval = true)
- public void setLobHandler(LobHandler lobHandler) {
- this.lobHandler = lobHandler;
- }
-
/**
* Sets the {@link Charset} to use when deserializing the execution context. Defaults
* to "UTF-8". Must not be {@code null}.
@@ -210,7 +198,6 @@ public void afterPropertiesSet() throws Exception {
protected ExecutionContextDao createExecutionContextDao() throws Exception {
JdbcExecutionContextDao dao = new JdbcExecutionContextDao();
dao.setJdbcTemplate(jdbcOperations);
- dao.setLobHandler(lobHandler);
dao.setTablePrefix(tablePrefix);
dao.setSerializer(serializer);
dao.setCharset(charset);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MongoJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/MongoJobExplorerFactoryBean.java
similarity index 78%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MongoJobExplorerFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/MongoJobExplorerFactoryBean.java
index c9e38e76f8..13997a0fd7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MongoJobExplorerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/MongoJobExplorerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core.explore.support;
+package org.springframework.batch.core.repository.explore.support;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.dao.StepExecutionDao;
-import org.springframework.batch.core.repository.dao.MongoExecutionContextDao;
-import org.springframework.batch.core.repository.dao.MongoJobExecutionDao;
-import org.springframework.batch.core.repository.dao.MongoJobInstanceDao;
-import org.springframework.batch.core.repository.dao.MongoStepExecutionDao;
+import org.springframework.batch.core.repository.dao.mongodb.MongoExecutionContextDao;
+import org.springframework.batch.core.repository.dao.mongodb.MongoJobExecutionDao;
+import org.springframework.batch.core.repository.dao.mongodb.MongoJobInstanceDao;
+import org.springframework.batch.core.repository.dao.mongodb.MongoStepExecutionDao;
+import org.springframework.batch.core.repository.support.MongoJobRepositoryFactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -38,7 +39,10 @@
*
* @author Mahmoud Ben Hassine
* @since 5.2.0
+ * @deprecated since 6.0 in favor of {@link MongoJobRepositoryFactoryBean}. Scheduled for
+ * removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class MongoJobExplorerFactoryBean extends AbstractJobExplorerFactoryBean implements InitializingBean {
private MongoOperations mongoOperations;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/SimpleJobExplorer.java
similarity index 60%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/SimpleJobExplorer.java
index 236be9902d..5e846060a3 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/SimpleJobExplorer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -14,18 +14,20 @@
* limitations under the License.
*/
-package org.springframework.batch.core.explore.support;
+package org.springframework.batch.core.repository.explore.support;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.support.SimpleJobRepository;
+import org.springframework.batch.item.ExecutionContext;
import org.springframework.lang.Nullable;
import java.util.List;
@@ -46,23 +48,20 @@
* @see JobExecutionDao
* @see StepExecutionDao
* @since 2.0
+ * @deprecated since 6.0 in favor of {@link SimpleJobRepository}. Scheduled for removal in
+ * 6.2 or later.
*/
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
public class SimpleJobExplorer implements JobExplorer {
- private JobInstanceDao jobInstanceDao;
+ protected JobInstanceDao jobInstanceDao;
- private JobExecutionDao jobExecutionDao;
+ protected JobExecutionDao jobExecutionDao;
- private StepExecutionDao stepExecutionDao;
+ protected StepExecutionDao stepExecutionDao;
- private ExecutionContextDao ecDao;
-
- /**
- * Provides a default constructor with low visibility in case you want to use
- * aop:proxy-target-class="true" for the AOP interceptor.
- */
- SimpleJobExplorer() {
- }
+ protected ExecutionContextDao ecDao;
/**
* Constructor to initialize the job {@link SimpleJobExplorer}.
@@ -80,6 +79,79 @@ public SimpleJobExplorer(JobInstanceDao jobInstanceDao, JobExecutionDao jobExecu
this.ecDao = ecDao;
}
+ /*
+ * ===================================================================================
+ * Job operations
+ * ===================================================================================
+ */
+
+ @Override
+ public List getJobNames() {
+ return jobInstanceDao.getJobNames();
+ }
+
+ /*
+ * ===================================================================================
+ * Job instance operations
+ * ===================================================================================
+ */
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
+ return jobInstanceDao.getJobInstance(jobName, jobParameters) != null;
+ }
+
+ /**
+ * @deprecated since v6.0 and scheduled for removal in v6.2. Use
+ * {@link #getJobInstances(String, int, int)} instead.
+ */
+ @Deprecated(since = "6.0", forRemoval = true)
+ @Override
+ public List findJobInstancesByJobName(String jobName, int start, int count) {
+ return getJobInstances(jobName, start, count);
+ }
+
+ @Override
+ @Deprecated(since = "6.0", forRemoval = true)
+ public List findJobInstancesByName(String jobName, int start, int count) {
+ return getJobInstances(jobName, start, count);
+ }
+
+ @Nullable
+ @Override
+ public JobInstance getJobInstance(@Nullable Long instanceId) {
+ return jobInstanceDao.getJobInstance(instanceId);
+ }
+
+ @Nullable
+ @Override
+ public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
+ return jobInstanceDao.getJobInstance(jobName, jobParameters);
+ }
+
+ @Nullable
+ @Override
+ public JobInstance getLastJobInstance(String jobName) {
+ return jobInstanceDao.getLastJobInstance(jobName);
+ }
+
+ @Override
+ public List getJobInstances(String jobName, int start, int count) {
+ return jobInstanceDao.getJobInstances(jobName, start, count);
+ }
+
+ @Override
+ public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
+ return jobInstanceDao.getJobInstanceCount(jobName);
+ }
+
+ /*
+ * ===================================================================================
+ * Job execution operations
+ * ===================================================================================
+ */
+
@Override
public List getJobExecutions(JobInstance jobInstance) {
List executions = jobExecutionDao.findJobExecutions(jobInstance);
@@ -105,6 +177,32 @@ public JobExecution getLastJobExecution(JobInstance jobInstance) {
return lastJobExecution;
}
+ @Deprecated(since = "6.0", forRemoval = true)
+ @Override
+ public List findJobExecutions(JobInstance jobInstance) {
+ List jobExecutions = this.jobExecutionDao.findJobExecutions(jobInstance);
+ for (JobExecution jobExecution : jobExecutions) {
+ this.stepExecutionDao.addStepExecutions(jobExecution);
+ }
+ return jobExecutions;
+ }
+
+ @Override
+ @Nullable
+ public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobName, jobParameters);
+ if (jobInstance == null) {
+ return null;
+ }
+ JobExecution jobExecution = jobExecutionDao.getLastJobExecution(jobInstance);
+
+ if (jobExecution != null) {
+ jobExecution.setExecutionContext(ecDao.getExecutionContext(jobExecution));
+ stepExecutionDao.addStepExecutions(jobExecution);
+ }
+ return jobExecution;
+ }
+
@Override
public Set findRunningJobExecutions(@Nullable String jobName) {
Set executions = jobExecutionDao.findRunningJobExecutions(jobName);
@@ -134,6 +232,24 @@ public JobExecution getJobExecution(@Nullable Long executionId) {
return jobExecution;
}
+ /*
+ * Find all dependencies for a JobExecution, including JobInstance (which requires
+ * JobParameters) plus StepExecutions
+ */
+ private void getJobExecutionDependencies(JobExecution jobExecution) {
+ JobInstance jobInstance = jobInstanceDao.getJobInstance(jobExecution);
+ stepExecutionDao.addStepExecutions(jobExecution);
+ jobExecution.setJobInstance(jobInstance);
+ jobExecution.setExecutionContext(ecDao.getExecutionContext(jobExecution));
+
+ }
+
+ /*
+ * ===================================================================================
+ * Step execution operations
+ * ===================================================================================
+ */
+
@Nullable
@Override
public StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable Long executionId) {
@@ -147,39 +263,41 @@ public StepExecution getStepExecution(@Nullable Long jobExecutionId, @Nullable L
return stepExecution;
}
- @Nullable
@Override
- public JobInstance getJobInstance(@Nullable Long instanceId) {
- return jobInstanceDao.getJobInstance(instanceId);
- }
-
@Nullable
- @Override
- public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
- return jobInstanceDao.getJobInstance(jobName, jobParameters);
- }
+ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+ StepExecution latest = stepExecutionDao.getLastStepExecution(jobInstance, stepName);
- @Nullable
- @Override
- public JobInstance getLastJobInstance(String jobName) {
- return jobInstanceDao.getLastJobInstance(jobName);
- }
+ if (latest != null) {
+ ExecutionContext stepExecutionContext = ecDao.getExecutionContext(latest);
+ latest.setExecutionContext(stepExecutionContext);
+ ExecutionContext jobExecutionContext = ecDao.getExecutionContext(latest.getJobExecution());
+ latest.getJobExecution().setExecutionContext(jobExecutionContext);
+ }
- @Override
- public List getJobInstances(String jobName, int start, int count) {
- return jobInstanceDao.getJobInstances(jobName, start, count);
+ return latest;
}
+ /**
+ * @return number of executions of the step within given job instance
+ */
@Override
- public List getJobNames() {
- return jobInstanceDao.getJobNames();
+ public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
+ return stepExecutionDao.countStepExecutions(jobInstance, stepName);
}
- @Override
- public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
- return jobInstanceDao.getJobInstanceCount(jobName);
+ private void getStepExecutionDependencies(StepExecution stepExecution) {
+ if (stepExecution != null) {
+ stepExecution.setExecutionContext(ecDao.getExecutionContext(stepExecution));
+ }
}
+ /*
+ * ===================================================================================
+ * protected methods
+ * ===================================================================================
+ */
+
/**
* @return instance of {@link JobInstanceDao}.
* @since 5.1
@@ -212,27 +330,4 @@ protected ExecutionContextDao getEcDao() {
return ecDao;
}
- /*
- * Find all dependencies for a JobExecution, including JobInstance (which requires
- * JobParameters) plus StepExecutions
- */
- private void getJobExecutionDependencies(JobExecution jobExecution) {
- JobInstance jobInstance = jobInstanceDao.getJobInstance(jobExecution);
- stepExecutionDao.addStepExecutions(jobExecution);
- jobExecution.setJobInstance(jobInstance);
- jobExecution.setExecutionContext(ecDao.getExecutionContext(jobExecution));
-
- }
-
- private void getStepExecutionDependencies(StepExecution stepExecution) {
- if (stepExecution != null) {
- stepExecution.setExecutionContext(ecDao.getExecutionContext(stepExecution));
- }
- }
-
- @Override
- public List findJobInstancesByJobName(String jobName, int start, int count) {
- return jobInstanceDao.findJobInstancesByName(jobName, start, count);
- }
-
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/package-info.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/package-info.java
similarity index 72%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/package-info.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/package-info.java
index 6150d736cb..44b0a8f465 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/package-info.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/package-info.java
@@ -5,6 +5,6 @@
* @author Mahmoud Ben Hassine
*/
@NonNullApi
-package org.springframework.batch.core.explore.support;
+package org.springframework.batch.core.repository.explore.support;
import org.springframework.lang.NonNullApi;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobExecutionConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobExecutionConverter.java
index 686c48464c..3239b485b9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobExecutionConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobExecutionConverter.java
@@ -18,8 +18,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.persistence.ExecutionContext;
import org.springframework.batch.core.repository.persistence.ExitStatus;
import org.springframework.batch.core.repository.persistence.JobExecution;
@@ -35,11 +35,12 @@ public class JobExecutionConverter {
private final StepExecutionConverter stepExecutionConverter = new StepExecutionConverter();
- public org.springframework.batch.core.JobExecution toJobExecution(JobExecution source, JobInstance jobInstance) {
- Map> parameterMap = new HashMap<>();
+ public org.springframework.batch.core.job.JobExecution toJobExecution(JobExecution source,
+ JobInstance jobInstance) {
+ Map> parameterMap = new HashMap<>();
source.getJobParameters()
.forEach((key, value) -> parameterMap.put(key, this.jobParameterConverter.toJobParameter(value)));
- org.springframework.batch.core.JobExecution jobExecution = new org.springframework.batch.core.JobExecution(
+ org.springframework.batch.core.job.JobExecution jobExecution = new org.springframework.batch.core.job.JobExecution(
jobInstance, source.getJobExecutionId(), new JobParameters(parameterMap));
jobExecution.addStepExecutions(source.getStepExecutions()
.stream()
@@ -57,7 +58,7 @@ public org.springframework.batch.core.JobExecution toJobExecution(JobExecution s
return jobExecution;
}
- public JobExecution fromJobExecution(org.springframework.batch.core.JobExecution source) {
+ public JobExecution fromJobExecution(org.springframework.batch.core.job.JobExecution source) {
JobExecution jobExecution = new JobExecution();
jobExecution.setJobExecutionId(source.getId());
jobExecution.setJobInstanceId(source.getJobInstance().getInstanceId());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobInstanceConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobInstanceConverter.java
index 82b3a277de..a52f23ee75 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobInstanceConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobInstanceConverter.java
@@ -23,11 +23,11 @@
*/
public class JobInstanceConverter {
- public org.springframework.batch.core.JobInstance toJobInstance(JobInstance source) {
- return new org.springframework.batch.core.JobInstance(source.getJobInstanceId(), source.getJobName());
+ public org.springframework.batch.core.job.JobInstance toJobInstance(JobInstance source) {
+ return new org.springframework.batch.core.job.JobInstance(source.getJobInstanceId(), source.getJobName());
}
- public JobInstance fromJobInstance(org.springframework.batch.core.JobInstance source) {
+ public JobInstance fromJobInstance(org.springframework.batch.core.job.JobInstance source) {
JobInstance jobInstance = new JobInstance();
jobInstance.setJobName(source.getJobName());
jobInstance.setJobInstanceId(source.getInstanceId());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobParameterConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobParameterConverter.java
index 361c98c36b..dfa6a89b82 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobParameterConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/JobParameterConverter.java
@@ -23,9 +23,9 @@
*/
public class JobParameterConverter {
- public org.springframework.batch.core.JobParameter toJobParameter(JobParameter source) {
+ public org.springframework.batch.core.job.parameters.JobParameter toJobParameter(JobParameter source) {
try {
- return new org.springframework.batch.core.JobParameter<>(source.value(),
+ return new org.springframework.batch.core.job.parameters.JobParameter<>(source.value(),
(Class) Class.forName(source.type()), source.identifying());
}
catch (ClassNotFoundException e) {
@@ -33,7 +33,7 @@ public org.springframework.batch.core.JobParameter toJobParameter(JobPara
}
}
- public JobParameter fromJobParameter(org.springframework.batch.core.JobParameter source) {
+ public JobParameter fromJobParameter(org.springframework.batch.core.job.parameters.JobParameter source) {
return new JobParameter<>(source.getValue(), source.getType().getName(), source.isIdentifying());
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/StepExecutionConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/StepExecutionConverter.java
index 221e9c50cf..785cd2456f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/StepExecutionConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/converter/StepExecutionConverter.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.repository.persistence.converter;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.repository.persistence.ExecutionContext;
import org.springframework.batch.core.repository.persistence.ExitStatus;
import org.springframework.batch.core.repository.persistence.StepExecution;
@@ -26,9 +26,9 @@
*/
public class StepExecutionConverter {
- public org.springframework.batch.core.StepExecution toStepExecution(StepExecution source,
+ public org.springframework.batch.core.step.StepExecution toStepExecution(StepExecution source,
JobExecution jobExecution) {
- org.springframework.batch.core.StepExecution stepExecution = new org.springframework.batch.core.StepExecution(
+ org.springframework.batch.core.step.StepExecution stepExecution = new org.springframework.batch.core.step.StepExecution(
source.getName(), jobExecution, source.getStepExecutionId());
stepExecution.setStatus(source.getStatus());
stepExecution.setReadCount(source.getReadCount());
@@ -53,7 +53,7 @@ public org.springframework.batch.core.StepExecution toStepExecution(StepExecutio
return stepExecution;
}
- public StepExecution fromStepExecution(org.springframework.batch.core.StepExecution source) {
+ public StepExecution fromStepExecution(org.springframework.batch.core.step.StepExecution source) {
StepExecution stepExecution = new StepExecution();
stepExecution.setStepExecutionId(source.getId());
stepExecution.setJobExecutionId(source.getJobExecutionId());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java
index 639a034ebd..1d304dba63 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -22,6 +22,9 @@
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.NameMatchMethodPointcut;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobKeyGenerator;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
@@ -43,7 +46,8 @@
* A {@link FactoryBean} that automates the creation of a {@link SimpleJobRepository}.
* Declares abstract methods for providing DAO object implementations.
*
- * @see JobRepositoryFactoryBean
+ * @see JdbcJobRepositoryFactoryBean
+ * @see MongoJobRepositoryFactoryBean
* @author Ben Hale
* @author Lucas Ward
* @author Robert Kasanicky
@@ -70,6 +74,8 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean getJobNames() {
+ if (this.jobInstance == null) {
+ return Collections.emptyList();
+ }
+ return Collections.singletonList(this.jobInstance.getJobName());
+ }
+
+ @SuppressWarnings("removal")
@Override
public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
return false;
}
+ @Override
+ public long getJobInstanceCount(String jobName) {
+ return 1;
+ }
+
@Override
public JobInstance createJobInstance(String jobName, JobParameters jobParameters) {
this.jobInstance = new JobInstance(1L, jobName);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
index e98752c987..202e024d23 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,10 +19,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.repository.explore.support.SimpleJobExplorer;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
@@ -32,7 +33,6 @@
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.dao.StepExecutionDao;
import org.springframework.batch.item.ExecutionContext;
-import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import java.time.LocalDateTime;
@@ -60,56 +60,14 @@
* @see StepExecutionDao
*
*/
-public class SimpleJobRepository implements JobRepository {
+@SuppressWarnings("removal")
+public class SimpleJobRepository extends SimpleJobExplorer implements JobRepository {
private static final Log logger = LogFactory.getLog(SimpleJobRepository.class);
- private JobInstanceDao jobInstanceDao;
-
- private JobExecutionDao jobExecutionDao;
-
- private StepExecutionDao stepExecutionDao;
-
- private ExecutionContextDao ecDao;
-
- /**
- * Provide default constructor with low visibility in case user wants to use
- * aop:proxy-target-class="true" for AOP interceptor.
- */
- SimpleJobRepository() {
- }
-
public SimpleJobRepository(JobInstanceDao jobInstanceDao, JobExecutionDao jobExecutionDao,
StepExecutionDao stepExecutionDao, ExecutionContextDao ecDao) {
- super();
- this.jobInstanceDao = jobInstanceDao;
- this.jobExecutionDao = jobExecutionDao;
- this.stepExecutionDao = stepExecutionDao;
- this.ecDao = ecDao;
- }
-
- @Override
- public List getJobNames() {
- return this.jobInstanceDao.getJobNames();
- }
-
- @Override
- public List findJobInstancesByName(String jobName, int start, int count) {
- return this.jobInstanceDao.findJobInstancesByName(jobName, start, count);
- }
-
- @Override
- public List findJobExecutions(JobInstance jobInstance) {
- List jobExecutions = this.jobExecutionDao.findJobExecutions(jobInstance);
- for (JobExecution jobExecution : jobExecutions) {
- this.stepExecutionDao.addStepExecutions(jobExecution);
- }
- return jobExecutions;
- }
-
- @Override
- public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
- return jobInstanceDao.getJobInstance(jobName, jobParameters) != null;
+ super(jobInstanceDao, jobExecutionDao, stepExecutionDao, ecDao);
}
@Override
@@ -249,34 +207,6 @@ public void updateExecutionContext(JobExecution jobExecution) {
ecDao.updateExecutionContext(jobExecution);
}
- @Override
- public JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
- return jobInstanceDao.getJobInstance(jobName, jobParameters);
- }
-
- @Override
- @Nullable
- public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
- StepExecution latest = stepExecutionDao.getLastStepExecution(jobInstance, stepName);
-
- if (latest != null) {
- ExecutionContext stepExecutionContext = ecDao.getExecutionContext(latest);
- latest.setExecutionContext(stepExecutionContext);
- ExecutionContext jobExecutionContext = ecDao.getExecutionContext(latest.getJobExecution());
- latest.getJobExecution().setExecutionContext(jobExecutionContext);
- }
-
- return latest;
- }
-
- /**
- * @return number of executions of the step within given job instance
- */
- @Override
- public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
- return stepExecutionDao.countStepExecutions(jobInstance, stepName);
- }
-
/**
* Check to determine whether or not the JobExecution that is the parent of the
* provided StepExecution has been interrupted. If, after synchronizing the status
@@ -293,23 +223,6 @@ private void checkForInterruption(StepExecution stepExecution) {
}
}
- @Override
- @Nullable
- public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
- JobInstance jobInstance = jobInstanceDao.getJobInstance(jobName, jobParameters);
- if (jobInstance == null) {
- return null;
- }
- JobExecution jobExecution = jobExecutionDao.getLastJobExecution(jobInstance);
-
- if (jobExecution != null) {
- jobExecution.setExecutionContext(ecDao.getExecutionContext(jobExecution));
- stepExecutionDao.addStepExecutions(jobExecution);
- }
- return jobExecution;
-
- }
-
@Override
public void deleteStepExecution(StepExecution stepExecution) {
this.ecDao.deleteExecutionContext(stepExecution);
@@ -328,7 +241,7 @@ public void deleteJobExecution(JobExecution jobExecution) {
@Override
public void deleteJobInstance(JobInstance jobInstance) {
- List jobExecutions = findJobExecutions(jobInstance);
+ List jobExecutions = getJobExecutions(jobInstance);
for (JobExecution jobExecution : jobExecutions) {
deleteJobExecution(jobExecution);
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java
index 3bc7bc0aeb..64d8f45b6e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,9 +16,9 @@
package org.springframework.batch.core.resource;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.repeat.CompletionPolicy;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatStatus;
@@ -44,7 +44,9 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @see CompletionPolicy
+ * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
*/
+@Deprecated(since = "6.0", forRemoval = true)
public class StepExecutionSimpleCompletionPolicy implements StepExecutionListener, CompletionPolicy {
private CompletionPolicy delegate;
@@ -65,7 +67,7 @@ public void setKeyName(String keyName) {
* {@link JobParameters}. If there is a Long parameter with the given key name, the
* intValue of this parameter is used. If not an exception will be thrown.
*
- * @see org.springframework.batch.core.StepExecutionListener#beforeStep(org.springframework.batch.core.StepExecution)
+ * @see StepExecutionListener#beforeStep(StepExecution)
*/
@Override
public void beforeStep(StepExecution stepExecution) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java
index 7cf74c855c..1b8da10bf5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java
@@ -185,8 +185,8 @@ protected Object resolveValue(Object value) {
BeanDefinition definition = null;
String beanName = null;
- if (value instanceof BeanDefinition) {
- definition = (BeanDefinition) value;
+ if (value instanceof BeanDefinition beanDefinition) {
+ definition = beanDefinition;
beanName = BeanDefinitionReaderUtils.generateBeanName(definition, registry);
}
else if (value instanceof BeanDefinitionHolder holder) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java
index 25e51964c7..bd92302649 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java
@@ -25,11 +25,11 @@
import java.util.Properties;
import java.util.Set;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.scope.StepScope;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.context.SynchronizedAttributeAccessor;
@@ -161,8 +161,8 @@ public void close() {
}
Exception error = errors.get(0);
- if (error instanceof RuntimeException) {
- throw (RuntimeException) error;
+ if (error instanceof RuntimeException runtimeException) {
+ throw runtimeException;
}
else {
throw new UnexpectedJobExecutionException(
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobScopeManager.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobScopeManager.java
index 668f53c8fb..c7b5162529 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobScopeManager.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobScopeManager.java
@@ -18,8 +18,8 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
/**
* Convenient aspect to wrap a single threaded job execution, where the implementation of
@@ -32,7 +32,7 @@
@Aspect
public class JobScopeManager {
- @Around("execution(void org.springframework.batch.core.Job+.execute(*)) && target(job) && args(jobExecution)")
+ @Around("execution(void org.springframework.batch.core.job.Job+.execute(*)) && target(job) && args(jobExecution)")
public void execute(Job job, JobExecution jobExecution) {
JobSynchronizationManager.register(jobExecution);
try {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobSynchronizationManager.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobSynchronizationManager.java
index 0471cb4143..e3fa5d2ee3 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobSynchronizationManager.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobSynchronizationManager.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.scope.context;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.lang.Nullable;
/**
@@ -60,12 +60,12 @@ public static JobContext getContext() {
* Register a context with the current thread - always put a matching {@link #close()}
* call in a finally block to ensure that the correct context is available in the
* enclosing block.
- * @param JobExecution the step context to register
+ * @param jobExecution the step context to register
* @return a new {@link JobContext} or the current one if it has the same
* {@link JobExecution}
*/
- public static JobContext register(JobExecution JobExecution) {
- return manager.register(JobExecution);
+ public static JobContext register(JobExecution jobExecution) {
+ return manager.register(jobExecution);
}
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java
index a076b5bee9..579aab3879 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java
@@ -25,11 +25,11 @@
import java.util.Properties;
import java.util.Set;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.scope.StepScope;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.context.SynchronizedAttributeAccessor;
@@ -197,8 +197,8 @@ public void close() {
}
Exception error = errors.get(0);
- if (error instanceof RuntimeException) {
- throw (RuntimeException) error;
+ if (error instanceof RuntimeException runtimeException) {
+ throw runtimeException;
}
else {
throw new UnexpectedJobExecutionException(
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java
index a30466c378..7ad0ca1dd4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.repeat.RepeatCallback;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepScopeManager.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepScopeManager.java
index 7780dc950c..7ee8cff9c0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepScopeManager.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepScopeManager.java
@@ -18,9 +18,9 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
/**
* Convenient aspect to wrap a single threaded step execution, where the implementation of
@@ -32,7 +32,7 @@
@Aspect
public class StepScopeManager {
- @Around("execution(void org.springframework.batch.core.Step+.execute(*)) && target(step) && args(stepExecution)")
+ @Around("execution(void org.springframework.batch.core.step.Step+.execute(*)) && target(step) && args(stepExecution)")
public void execute(Step step, StepExecution stepExecution) throws JobInterruptedException {
StepSynchronizationManager.register(stepExecution);
try {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepSynchronizationManager.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepSynchronizationManager.java
index 9fbf4ef853..34c24d0dc0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepSynchronizationManager.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepSynchronizationManager.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.scope.context;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
index 1891f55883..f76a48b55a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2025 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.
@@ -28,6 +28,7 @@
* @author Dave Syer
* @author Jimmy Praet
* @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
* @since 3.0
*/
public abstract class SynchronizationManagerSupport {
@@ -87,11 +88,7 @@ public C register(@Nullable E execution) {
getCurrent().push(execution);
C context;
synchronized (contexts) {
- context = contexts.get(execution);
- if (context == null) {
- context = createNewContext(execution);
- contexts.put(execution, context);
- }
+ context = contexts.computeIfAbsent(execution, this::createNewContext);
}
increment();
return context;
@@ -131,11 +128,7 @@ public void increment() {
if (current != null) {
AtomicInteger count;
synchronized (counts) {
- count = counts.get(current);
- if (count == null) {
- count = new AtomicInteger();
- counts.put(current, count);
- }
+ count = counts.computeIfAbsent(current, k -> new AtomicInteger());
}
count.incrementAndGet();
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
index c2339b95df..ba83296433 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -29,12 +29,10 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobInterruptedException;
+import org.springframework.batch.core.job.JobInterruptedException;
import org.springframework.batch.core.SpringBatchVersion;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.launch.support.ExitCodeMapper;
@@ -81,6 +79,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
+ @SuppressWarnings("unused")
private MeterRegistry meterRegistry = Metrics.globalRegistry;
private BatchStepObservationConvention observationConvention = new DefaultBatchStepObservationConvention();
@@ -94,7 +93,6 @@ public AbstractStep() {
@Override
public void afterPropertiesSet() throws Exception {
- Assert.state(name != null, "A Step must have a name");
Assert.state(jobRepository != null, "JobRepository is mandatory");
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/FatalStepExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/FatalStepExecutionException.java
index 2b40a9bde3..5be3202068 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/FatalStepExecutionException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/FatalStepExecutionException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.step;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
/**
* @author Dave Syer
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java
index e30e9bd426..940230080a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -17,8 +17,7 @@
package org.springframework.batch.core.step;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/Step.java
similarity index 92%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/Step.java
index 834cfac6ce..071560b3cb 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/Step.java
@@ -13,7 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.step;
+
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobInterruptedException;
/**
* Batch domain interface representing the configuration of a step. As with a {@link Job},
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepContribution.java
similarity index 93%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/StepContribution.java
index fcbeaa9284..340505c964 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepContribution.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.step;
import java.io.Serializable;
+import org.springframework.batch.core.ExitStatus;
+
/**
* Represents a contribution to a {@link StepExecution}, buffering changes until they can
* be applied at a chunk boundary.
@@ -155,6 +157,15 @@ public void incrementWriteSkipCount() {
writeSkipCount++;
}
+ /**
+ * Increment the write skip count for this contribution.
+ * @param count The {@code long} amount to increment by.
+ * @since 6.0.0
+ */
+ public void incrementWriteSkipCount(long count) {
+ writeSkipCount += count;
+ }
+
/**
*
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecution.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecution.java
index 1bf5164778..939102aaa5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecution.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.core;
+package org.springframework.batch.core.step;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -23,6 +23,11 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Entity;
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
@@ -492,7 +497,7 @@ public boolean equals(Object obj) {
return super.equals(obj);
}
- return stepName.equals(other.getStepName()) && (jobExecutionId.equals(other.getJobExecutionId()))
+ return stepName.equals(other.getStepName()) && jobExecutionId.equals(other.getJobExecutionId())
&& getId().equals(other.getId());
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepHolder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepHolder.java
index 1f4a51c91d..33ad81ef12 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepHolder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepHolder.java
@@ -15,8 +15,6 @@
*/
package org.springframework.batch.core.step;
-import org.springframework.batch.core.Step;
-
/**
* Interface for holders of a {@link Step} as a convenience for callers who need access to
* the underlying instance.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
index 20a90fa6d6..1c2f74c75c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
@@ -16,9 +16,7 @@
package org.springframework.batch.core.step;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
/**
* Strategy interface for an interruption policy. This policy allows {@link Step}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
index c275d20623..bc32a2b984 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocator.java
@@ -17,8 +17,6 @@
import java.util.Collection;
-import org.springframework.batch.core.Step;
-
/**
* Interface for locating a {@link Step} instance by name.
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java
index 98faf4b483..715983d454 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java
@@ -15,8 +15,7 @@
*/
package org.springframework.batch.core.step;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
import org.springframework.beans.factory.FactoryBean;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
index f1ee332fb1..6f815c966b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
@@ -18,8 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
/**
* Policy that checks the current thread to see if it has been interrupted.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
index 55e6a0fdce..fa454da245 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -20,8 +20,8 @@
import java.util.LinkedHashSet;
import java.util.Set;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.annotation.AfterChunk;
import org.springframework.batch.core.annotation.AfterChunkError;
import org.springframework.batch.core.annotation.BeforeChunk;
@@ -67,8 +67,6 @@ public abstract class AbstractTaskletStepBuilder parent) {
@@ -88,7 +86,6 @@ public AbstractTaskletStepBuilder(AbstractTaskletStepBuilder parent) {
this.transactionAttribute = parent.transactionAttribute;
this.streams.addAll(parent.streams);
this.exceptionHandler = parent.exceptionHandler;
- this.throttleLimit = parent.throttleLimit;
this.taskExecutor = parent.taskExecutor;
}
@@ -125,7 +122,6 @@ public TaskletStep build() {
if (taskExecutor != null) {
TaskExecutorRepeatTemplate repeatTemplate = new TaskExecutorRepeatTemplate();
repeatTemplate.setTaskExecutor(taskExecutor);
- repeatTemplate.setThrottleLimit(throttleLimit);
stepOperations = repeatTemplate;
}
@@ -150,8 +146,8 @@ public TaskletStep build() {
protected void registerStepListenerAsChunkListener() {
for (StepExecutionListener stepExecutionListener : properties.getStepExecutionListeners()) {
- if (stepExecutionListener instanceof ChunkListener) {
- listener((ChunkListener) stepExecutionListener);
+ if (stepExecutionListener instanceof ChunkListener chunkListener) {
+ listener(chunkListener);
}
}
}
@@ -210,24 +206,6 @@ public B taskExecutor(TaskExecutor taskExecutor) {
return self();
}
- /**
- * In the case of an asynchronous {@link #taskExecutor(TaskExecutor)} the number of
- * concurrent tasklet executions can be throttled (beyond any throttling provided by a
- * thread pool). The throttle limit should be less than the data source pool size used
- * in the job repository for this step.
- * @param throttleLimit maximum number of concurrent tasklet executions allowed
- * @return this for fluent chaining
- * @deprecated with no replacement since 5.0, scheduled for removal in 6.0. Use a
- * custom {@link RepeatOperations} implementation (based on a {@link TaskExecutor}
- * with a bounded task queue) and set it on the step with
- * {@link #stepOperations(RepeatOperations)}.
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public B throttleLimit(int throttleLimit) {
- this.throttleLimit = throttleLimit;
- return self();
- }
-
/**
* Sets the exception handler to use in the case of tasklet failures. Default is to
* rethrow everything.
@@ -302,11 +280,6 @@ protected TaskExecutor getTaskExecutor() {
return taskExecutor;
}
- @Deprecated(since = "5.0", forRemoval = true)
- protected int getThrottleLimit() {
- return throttleLimit;
- }
-
protected TransactionAttribute getTransactionAttribute() {
return transactionAttribute;
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
index e4c24fb3b0..b40688b58c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.Set;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.annotation.OnSkipInProcess;
import org.springframework.batch.core.annotation.OnSkipInRead;
import org.springframework.batch.core.annotation.OnSkipInWrite;
@@ -574,11 +574,10 @@ else if (limitCheckingItemSkipPolicy != null) {
protected BatchRetryTemplate createRetryOperations() {
RetryPolicy retryPolicy = this.retryPolicy;
- SimpleRetryPolicy simpleRetryPolicy = null;
Map, Boolean> map = new HashMap<>(retryableExceptionClasses);
map.put(ForceRollbackForWriteSkipException.class, true);
- simpleRetryPolicy = new SimpleRetryPolicy(retryLimit, map);
+ SimpleRetryPolicy simpleRetryPolicy = new SimpleRetryPolicy(retryLimit, map);
if (retryPolicy == null) {
Assert.state(!(retryableExceptionClasses.isEmpty() && retryLimit > 0),
@@ -601,10 +600,10 @@ else if ((!retryableExceptionClasses.isEmpty() && retryLimit > 0)) {
// Coordinate the retry policy with the exception handler:
RepeatOperations stepOperations = getStepOperations();
- if (stepOperations instanceof RepeatTemplate) {
+ if (stepOperations instanceof RepeatTemplate repeatTemplate) {
SimpleRetryExceptionHandler exceptionHandler = new SimpleRetryExceptionHandler(retryPolicyWrapper,
getExceptionHandler(), nonRetryableExceptionClasses);
- ((RepeatTemplate) stepOperations).setExceptionHandler(exceptionHandler);
+ repeatTemplate.setExceptionHandler(exceptionHandler);
}
if (retryContextCache != null) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FlowStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FlowStepBuilder.java
index d838c9075c..1b77caade0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FlowStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FlowStepBuilder.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.step.builder;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowStep;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java
index a9abb9663b..d5f8559027 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/JobStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,10 +15,11 @@
*/
package org.springframework.batch.core.step.builder;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.job.JobParametersExtractor;
import org.springframework.batch.core.step.job.JobStep;
@@ -33,7 +34,7 @@ public class JobStepBuilder extends StepBuilderHelper {
private Job job;
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
private JobParametersExtractor jobParametersExtractor;
@@ -57,12 +58,12 @@ public JobStepBuilder job(Job job) {
}
/**
- * Add a job launcher. Defaults to a simple job launcher.
- * @param jobLauncher the job launcher to use
+ * Add a job operator. Defaults to a {@link TaskExecutorJobOperator}.
+ * @param jobOperator the job operator to use
* @return this for fluent chaining
*/
- public JobStepBuilder launcher(JobLauncher jobLauncher) {
- this.jobLauncher = jobLauncher;
+ public JobStepBuilder operator(JobOperator jobOperator) {
+ this.jobOperator = jobOperator;
return this;
}
@@ -92,18 +93,19 @@ public Step build() {
if (jobParametersExtractor != null) {
step.setJobParametersExtractor(jobParametersExtractor);
}
- if (jobLauncher == null) {
- TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
- jobLauncher.setJobRepository(getJobRepository());
+ if (jobOperator == null) {
+ TaskExecutorJobOperator jobOperator = new TaskExecutorJobOperator();
+ jobOperator.setJobRepository(getJobRepository());
+ jobOperator.setJobRegistry(new MapJobRegistry());
try {
- jobLauncher.afterPropertiesSet();
+ jobOperator.afterPropertiesSet();
}
catch (Exception e) {
throw new StepBuilderException(e);
}
- this.jobLauncher = jobLauncher;
+ this.jobOperator = jobOperator;
}
- step.setJobLauncher(jobLauncher);
+ step.setJobOperator(jobOperator);
try {
step.afterPropertiesSet();
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java
index cd4ffa0cbb..bac2b90331 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java
@@ -15,13 +15,13 @@
*/
package org.springframework.batch.core.step.builder;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.partition.StepExecutionSplitter;
-import org.springframework.batch.core.partition.support.PartitionStep;
-import org.springframework.batch.core.partition.support.Partitioner;
+import org.springframework.batch.core.partition.PartitionStep;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter;
-import org.springframework.batch.core.partition.support.StepExecutionAggregator;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
index fed10c44a1..0ce25a8184 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,12 +24,12 @@
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Metrics;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.ItemProcessListener;
+import org.springframework.batch.core.listener.ItemReadListener;
+import org.springframework.batch.core.listener.ItemWriteListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.annotation.AfterProcess;
import org.springframework.batch.core.annotation.AfterRead;
import org.springframework.batch.core.annotation.AfterWrite;
@@ -383,16 +383,16 @@ protected CompletionPolicy getChunkCompletionPolicy() {
protected void registerAsStreamsAndListeners(ItemReader itemReader,
ItemProcessor itemProcessor, ItemWriter itemWriter) {
for (Object itemHandler : new Object[] { itemReader, itemWriter, itemProcessor }) {
- if (itemHandler instanceof ItemStream) {
- stream((ItemStream) itemHandler);
+ if (itemHandler instanceof ItemStream itemStream) {
+ stream(itemStream);
}
if (StepListenerFactoryBean.isListener(itemHandler)) {
StepListener listener = StepListenerFactoryBean.getListener(itemHandler);
- if (listener instanceof StepExecutionListener) {
- listener((StepExecutionListener) listener);
+ if (listener instanceof StepExecutionListener stepExecutionListener) {
+ listener(stepExecutionListener);
}
- if (listener instanceof ChunkListener) {
- listener((ChunkListener) listener);
+ if (listener instanceof ChunkListener chunkListener) {
+ listener(chunkListener);
}
if (listener instanceof ItemReadListener || listener instanceof ItemProcessListener
|| listener instanceof ItemWriteListener) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
index 8d49029a7a..8d2993703c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,10 +15,10 @@
*/
package org.springframework.batch.core.step.builder;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.Flow;
-import org.springframework.batch.core.partition.support.Partitioner;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.CompletionPolicy;
@@ -35,13 +35,13 @@
public class StepBuilder extends StepBuilderHelper {
/**
- * Initialize a step builder for a step with the given name.
- * @param name the name of the step
- * @deprecated use {@link StepBuilder#StepBuilder(String, JobRepository)}
+ * Initialize a step builder for a step with the given job repository. The name of the
+ * step will be set to the bean name by default.
+ * @param jobRepository the job repository to which the step should report to.
+ * @since 6.0
*/
- @Deprecated(since = "5.0", forRemoval = true)
- public StepBuilder(String name) {
- super(name);
+ public StepBuilder(JobRepository jobRepository) {
+ super(jobRepository);
}
/**
@@ -54,17 +54,6 @@ public StepBuilder(String name, JobRepository jobRepository) {
super(name, jobRepository);
}
- /**
- * Build a step with a custom tasklet, not necessarily item processing.
- * @param tasklet a tasklet
- * @return a {@link TaskletStepBuilder}
- * @deprecated use {@link StepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public TaskletStepBuilder tasklet(Tasklet tasklet) {
- return new TaskletStepBuilder(this).tasklet(tasklet);
- }
-
/**
* Build a step with a custom tasklet, not necessarily item processing.
* @param tasklet a tasklet
@@ -76,27 +65,6 @@ public TaskletStepBuilder tasklet(Tasklet tasklet, PlatformTransactionManager tr
return new TaskletStepBuilder(this).tasklet(tasklet, transactionManager);
}
- /**
- * Build a step that processes items in chunks with the size provided. To extend the
- * step to being fault tolerant, call the {@link SimpleStepBuilder#faultTolerant()}
- * method on the builder. In most cases you will want to parameterize your call to
- * this method, to preserve the type safety of your readers and writers, e.g.
- *
- *
- * new StepBuilder("step1").<Order, Ledger> chunk(100).reader(new OrderReader()).writer(new LedgerWriter())
- * // ... etc.
- *
- * @param chunkSize the chunk size (commit interval)
- * @return a {@link SimpleStepBuilder}
- * @param the type of item to be processed as input
- * @param the type of item to be output
- * @deprecated use {@link StepBuilder#chunk(int, PlatformTransactionManager)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public SimpleStepBuilder chunk(int chunkSize) {
- return new SimpleStepBuilder(this).chunk(chunkSize);
- }
-
/**
* Build a step that processes items in chunks with the size provided. To extend the
* step to being fault tolerant, call the {@link SimpleStepBuilder#faultTolerant()}
@@ -119,29 +87,6 @@ public SimpleStepBuilder chunk(int chunkSize, PlatformTransactionMa
return new SimpleStepBuilder(this).transactionManager(transactionManager).chunk(chunkSize);
}
- /**
- * Build a step that processes items in chunks with the completion policy provided. To
- * extend the step to being fault tolerant, call the
- * {@link SimpleStepBuilder#faultTolerant()} method on the builder. In most cases you
- * will want to parameterize your call to this method, to preserve the type safety of
- * your readers and writers, e.g.
- *
- *
- * new StepBuilder("step1").<Order, Ledger> chunk(100).reader(new OrderReader()).writer(new LedgerWriter())
- * // ... etc.
- *
- * @param completionPolicy the completion policy to use to control chunk processing
- * @return a {@link SimpleStepBuilder}
- * @param the type of item to be processed as input
- * @param the type of item to be output
- * @deprecated use
- * {@link StepBuilder#chunk(CompletionPolicy, PlatformTransactionManager)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public SimpleStepBuilder chunk(CompletionPolicy completionPolicy) {
- return new SimpleStepBuilder(this).chunk(completionPolicy);
- }
-
/**
* Build a step that processes items in chunks with the completion policy provided. To
* extend the step to being fault tolerant, call the
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
index 577f383e08..0277bbf1d7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.annotation.AfterStep;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.listener.StepListenerFactoryBean;
@@ -54,14 +54,13 @@ public abstract class StepBuilderHelper> {
protected final CommonStepProperties properties;
/**
- * Create a new {@link StepBuilderHelper}.
- * @param name the step name
- * @deprecated use {@link StepBuilderHelper#StepBuilderHelper(String, JobRepository)}
+ * Create a new {@link StepBuilderHelper} with the given job repository.
+ * @param jobRepository the job repository
+ * @since 6.0
*/
- @Deprecated(since = "5.1", forRemoval = true)
- public StepBuilderHelper(String name) {
+ public StepBuilderHelper(JobRepository jobRepository) {
this.properties = new CommonStepProperties();
- properties.name = name;
+ properties.jobRepository = jobRepository;
}
/**
@@ -85,18 +84,6 @@ protected StepBuilderHelper(StepBuilderHelper parent) {
this.properties = new CommonStepProperties(parent.properties);
}
- /**
- * Set the job repository
- * @param jobRepository the repository to set
- * @return this to enable fluent chaining
- * @deprecated use {@link StepBuilderHelper#StepBuilderHelper(String, JobRepository)}
- */
- @Deprecated(since = "5.1", forRemoval = true)
- public B repository(JobRepository jobRepository) {
- properties.jobRepository = jobRepository;
- return self();
- }
-
/**
* Sets the step observation convention.
* @param observationConvention the step observation convention (optional)
@@ -199,6 +186,8 @@ protected void enhance(AbstractStep step) {
public static class CommonStepProperties {
+ private String name;
+
private List stepExecutionListeners = new ArrayList<>();
private int startLimit = Integer.MAX_VALUE;
@@ -295,8 +284,6 @@ public void setAllowStartIfComplete(Boolean allowStartIfComplete) {
this.allowStartIfComplete = allowStartIfComplete;
}
- private String name;
-
}
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
index bf4aad229f..896fce2cea 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -38,18 +38,6 @@ public TaskletStepBuilder(StepBuilderHelper parent) {
super(parent);
}
- /**
- * @param tasklet the tasklet to use
- * @return this for fluent chaining
- * @deprecated use
- * {@link TaskletStepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public TaskletStepBuilder tasklet(Tasklet tasklet) {
- this.tasklet = tasklet;
- return this;
- }
-
/**
* @param tasklet the tasklet to use
* @return this for fluent chaining
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/BatchListenerFactoryHelper.java
index 901ca75b3e..5d6d22ce0c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/BatchListenerFactoryHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/BatchListenerFactoryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.listener.StepListener;
/**
* Package private helper for step factory beans.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
index cec322ccd4..61e867db80 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,8 +21,8 @@
import java.util.HashSet;
import java.util.Map;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.builder.FaultTolerantStepBuilder;
import org.springframework.batch.core.step.builder.SimpleStepBuilder;
import org.springframework.batch.core.step.builder.StepBuilder;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java
index 5acb2a4d93..f12f4fda1a 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,13 +18,13 @@
import io.micrometer.observation.ObservationRegistry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemProcessListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.ItemProcessListener;
+import org.springframework.batch.core.listener.ItemReadListener;
+import org.springframework.batch.core.listener.ItemWriteListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.SimpleStepBuilder;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -107,7 +107,8 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameA
private CompletionPolicy chunkCompletionPolicy;
- private int throttleLimit = TaskExecutorRepeatTemplate.DEFAULT_THROTTLE_LIMIT;
+ @SuppressWarnings("unused")
+ private final int throttleLimit = TaskExecutorRepeatTemplate.DEFAULT_THROTTLE_LIMIT;
private boolean isReaderTransactionalQueue = false;
@@ -441,20 +442,6 @@ protected TaskExecutor getTaskExecutor() {
return taskExecutor;
}
- /**
- * Public setter for the throttle limit. This limits the number of tasks queued for
- * concurrent processing to prevent thread pools from being overwhelmed. Defaults to
- * {@link TaskExecutorRepeatTemplate#DEFAULT_THROTTLE_LIMIT}.
- * @param throttleLimit the throttle limit to set.
- * @deprecated since 5.0, scheduled for removal in 6.0. Use a pooled
- * {@link TaskExecutor} implementation with a limited capacity of its task queue
- * instead.
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public void setThrottleLimit(int throttleLimit) {
- this.throttleLimit = throttleLimit;
- }
-
protected void applyConfiguration(SimpleStepBuilder builder) {
builder.reader(itemReader);
@@ -482,7 +469,6 @@ protected void applyConfiguration(SimpleStepBuilder builder) {
}
builder.transactionManager(transactionManager);
builder.transactionAttribute(getTransactionAttribute());
- builder.repository(jobRepository);
builder.observationRegistry(observationRegistry);
builder.startLimit(startLimit);
builder.allowStartIfComplete(allowStartIfComplete);
@@ -491,7 +477,6 @@ protected void applyConfiguration(SimpleStepBuilder builder) {
builder.chunkOperations(chunkOperations);
builder.stepOperations(stepOperations);
builder.taskExecutor(taskExecutor);
- builder.throttleLimit(throttleLimit);
builder.exceptionHandler(exceptionHandler);
if (isReaderTransactionalQueue) {
builder.readerIsTransactionalQueue();
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java
index 47ac071075..edcb5b0a34 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java
@@ -58,7 +58,7 @@ public ChunkMonitorData(int offset, int chunkSize) {
private final CompositeItemStream stream = new CompositeItemStream();
- private final ThreadLocal holder = new ThreadLocal<>();
+ private static final ThreadLocal holder = new ThreadLocal<>();
private ItemReader reader;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java
index ef29d45e2b..cd780c2977 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.item.Chunk;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProcessor.java
index 51034c867e..ed29a3e005 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProcessor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProcessor.java
@@ -16,7 +16,7 @@
package org.springframework.batch.core.step.item;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.item.Chunk;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProvider.java
index f713af61fe..2541148a42 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkProvider.java
@@ -16,7 +16,7 @@
package org.springframework.batch.core.step.item;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.item.Chunk;
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java
index ecb797111c..04ef046685 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.listener.StepListenerFailedException;
import org.springframework.batch.core.observability.BatchMetrics;
import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy;
@@ -82,17 +82,17 @@ public void setKeyGenerator(KeyGenerator keyGenerator) {
}
/**
- * @param SkipPolicy the {@link SkipPolicy} for item processing
+ * @param skipPolicy the {@link SkipPolicy} for item processing
*/
- public void setProcessSkipPolicy(SkipPolicy SkipPolicy) {
- this.itemProcessSkipPolicy = SkipPolicy;
+ public void setProcessSkipPolicy(SkipPolicy skipPolicy) {
+ this.itemProcessSkipPolicy = skipPolicy;
}
/**
- * @param SkipPolicy the {@link SkipPolicy} for item writing
+ * @param skipPolicy the {@link SkipPolicy} for item writing
*/
- public void setWriteSkipPolicy(SkipPolicy SkipPolicy) {
- this.itemWriteSkipPolicy = SkipPolicy;
+ public void setWriteSkipPolicy(SkipPolicy skipPolicy) {
+ this.itemWriteSkipPolicy = skipPolicy;
}
/**
@@ -347,6 +347,7 @@ protected void write(final StepContribution contribution, final Chunk inputs,
stopTimer(sample, contribution.getStepExecution(), "chunk.write", status, "Chunk writing");
}
contribution.incrementWriteCount(outputs.size());
+ contribution.incrementWriteSkipCount(outputs.getSkipsSize());
}
else {
scan(contribution, inputs, outputs, chunkMonitor, false);
@@ -489,7 +490,7 @@ private boolean shouldSkip(SkipPolicy policy, Throwable e, long skipCount) {
throw ex;
}
catch (RuntimeException ex) {
- throw new SkipListenerFailedException("Fatal exception in SkipPolicy.", ex, e);
+ throw new SkipListenerFailedException("Fatal exception in skipPolicy.", ex, e);
}
}
@@ -526,11 +527,11 @@ private void checkSkipPolicy(Chunk.ChunkIterator inputIterator, Chunk.Chun
throw new RetryException("Non-skippable exception in recoverer", e);
}
else {
- if (e instanceof Exception) {
- throw (Exception) e;
+ if (e instanceof Exception exception) {
+ throw exception;
}
- else if (e instanceof Error) {
- throw (Error) e;
+ else if (e instanceof Error error) {
+ throw error;
}
else {
throw new RetryException("Non-skippable throwable in recoverer", e);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProvider.java
index 768bf0f793..e000650e44 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProvider.java
@@ -16,7 +16,7 @@
package org.springframework.batch.core.step.item;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy;
import org.springframework.batch.core.step.skip.NonSkippableReadException;
import org.springframework.batch.core.step.skip.SkipException;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java
index 101945bb22..58ea60dcdb 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,9 +23,9 @@
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Timer;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.listener.MulticasterBatchListener;
import org.springframework.batch.core.observability.BatchMetrics;
import org.springframework.batch.item.Chunk;
@@ -309,6 +309,7 @@ protected void write(StepContribution contribution, Chunk inputs, Chunk ou
stopTimer(sample, contribution.getStepExecution(), "chunk.write", status, "Chunk writing");
}
contribution.incrementWriteCount(outputs.size());
+ contribution.incrementWriteSkipCount(outputs.getSkipsSize());
}
protected Chunk transform(StepContribution contribution, Chunk inputs) throws Exception {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java
index 3308d334b6..d5420b6123 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,9 +24,9 @@
import io.micrometer.core.instrument.Timer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.listener.MulticasterBatchListener;
import org.springframework.batch.core.observability.BatchMetrics;
import org.springframework.batch.item.Chunk;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java
index f37de435a5..dcbdb70ac3 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,11 +21,11 @@
import java.util.Properties;
import java.util.Set;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
import org.springframework.batch.item.ExecutionContext;
@@ -83,7 +83,7 @@ else if (jobParameters.containsKey(key)) {
builder.addJobParameter(key, jobParameters.get(key));
}
}
- builder.addJobParameters(this.jobParametersConverter.getJobParameters(properties));
+ builder.addJobParameters(convert(properties));
return builder.toJobParameters();
}
@@ -99,10 +99,24 @@ public void setUseAllParentParameters(boolean useAllParentParameters) {
/**
* Set the {@link JobParametersConverter} to use.
* @param jobParametersConverter the converter to use. Must not be {@code null}.
+ * @deprecated since 6.0 in favor of {@link #convert(Properties)}, scheduled for
+ * removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public void setJobParametersConverter(@NonNull JobParametersConverter jobParametersConverter) {
Assert.notNull(jobParametersConverter, "jobParametersConverter must not be null");
this.jobParametersConverter = jobParametersConverter;
}
+ /**
+ * Convert the given {@link Properties} to {@link JobParameters}.
+ * @param properties the properties to convert
+ * @return the converted job parameters
+ *
+ * @since 6.0
+ */
+ protected JobParameters convert(Properties properties) {
+ return this.jobParametersConverter.getJobParameters(properties);
+ }
+
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobParametersExtractor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobParametersExtractor.java
index ecc5f86b81..a365d31c0e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobParametersExtractor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobParametersExtractor.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.step.job;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
/**
* Strategy interface for translating a {@link StepExecution} into {@link JobParameters}.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java
index 2176fbe73d..40d6edd9e1 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/JobStep.java
@@ -17,13 +17,13 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.util.Assert;
@@ -47,14 +47,14 @@ public class JobStep extends AbstractStep {
private Job job;
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
private JobParametersExtractor jobParametersExtractor = new DefaultJobParametersExtractor();
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
- Assert.state(jobLauncher != null, "A JobLauncher must be provided");
+ Assert.state(jobOperator != null, "A JobOperator must be provided");
Assert.state(job != null, "A Job must be provided");
}
@@ -67,11 +67,11 @@ public void setJob(Job job) {
}
/**
- * A {@link JobLauncher} is required to be able to run the enclosed {@link Job}.
- * @param jobLauncher the {@link JobLauncher} to set
+ * A {@link JobOperator} is required to be able to start the enclosed {@link Job}.
+ * @param jobOperator the {@link JobOperator} to set
*/
- public void setJobLauncher(JobLauncher jobLauncher) {
- this.jobLauncher = jobLauncher;
+ public void setJobOperator(JobOperator jobOperator) {
+ this.jobOperator = jobOperator;
}
/**
@@ -86,7 +86,7 @@ public void setJobParametersExtractor(JobParametersExtractor jobParametersExtrac
}
/**
- * Execute the job provided by delegating to the {@link JobLauncher} to prevent
+ * Execute the job provided by delegating to the {@link JobOperator} to prevent
* duplicate executions. The job parameters will be generated by the
* {@link JobParametersExtractor} provided (if any), otherwise empty. On a restart,
* the job parameters will be the same as the last (failed) execution.
@@ -109,7 +109,7 @@ protected void doExecute(StepExecution stepExecution) throws Exception {
executionContext.put(JOB_PARAMETERS_KEY, jobParameters);
}
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
stepExecution.setExitStatus(determineStepExitStatus(stepExecution, jobExecution));
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java
index fb515ea969..209fb969da 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java
@@ -19,8 +19,8 @@
import java.util.Collections;
import java.util.Map;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.file.FlatFileParseException;
import org.springframework.classify.BinaryExceptionClassifier;
import org.springframework.classify.Classifier;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipException.java
index 969eae5a6a..09b65ad2c4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.step.skip;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
/**
* Base exception indicating that the skip has failed or caused a failure.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipLimitExceededException.java
index 5fc31c05f6..33fd4ac9db 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipLimitExceededException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipLimitExceededException.java
@@ -15,9 +15,11 @@
*/
package org.springframework.batch.core.step.skip;
+import org.springframework.batch.core.step.Step;
+
/**
- * Exception indicating that the skip limit for a particular
- * {@link org.springframework.batch.core.Step} has been exceeded.
+ * Exception indicating that the skip limit for a particular {@link Step} has been
+ * exceeded.
*
* @author Ben Hale
* @author Lucas Ward
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipListenerFailedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipListenerFailedException.java
index d883ccf485..f22850b279 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipListenerFailedException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipListenerFailedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.step.skip;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
/**
* Special exception to indicate a failure in a skip listener. These need special
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java
index 15486d82b7..e1eb831d7c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java
@@ -28,9 +28,9 @@ public interface SkipPolicy {
/**
* Returns true or false, indicating whether or not processing should continue with
- * the given throwable. Clients may use {@code skipCount<0} to probe for exception
+ * the given throwable. Clients may use {@code skipCount < 0} to probe for exception
* types that are skippable, so implementations should be able to handle gracefully
- * the case where {@code skipCount<0}. Implementations should avoid throwing any
+ * the case where {@code skipCount < 0}. Implementations should avoid throwing any
* undeclared exceptions.
* @param t exception encountered while processing
* @param skipCount currently running count of skips
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicyFailedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicyFailedException.java
index f5ce18e446..d38c09beba 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicyFailedException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicyFailedException.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.step.skip;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
/**
* Special exception to indicate a failure in a skip policy. These need special treatment
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java
index de610aaa22..d22f2e7360 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java
@@ -17,7 +17,7 @@
import java.util.concurrent.Callable;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java
index 86206538f4..c1ff049150 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java
@@ -16,7 +16,7 @@
package org.springframework.batch.core.step.tasklet;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator;
import org.springframework.batch.repeat.RepeatStatus;
@@ -59,8 +59,8 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon
* @return an {@link ExitStatus} consistent with the result
*/
protected ExitStatus mapResult(Object result) {
- if (result instanceof ExitStatus) {
- return (ExitStatus) result;
+ if (result instanceof ExitStatus exitStatus) {
+ return exitStatus;
}
return ExitStatus.COMPLETED;
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/StoppableTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/StoppableTasklet.java
index 4d604afd6d..5795b6cfa5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/StoppableTasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/StoppableTasklet.java
@@ -16,6 +16,7 @@
package org.springframework.batch.core.step.tasklet;
import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.step.StepContribution;
/**
* An extension to the {@link Tasklet} interface to allow users to add logic for stopping
@@ -24,7 +25,7 @@
* will attempt to call the stop method on any currently running StoppableTasklet. The
* call to {@link StoppableTasklet#stop()} will be from a thread other than the thread
* executing
- * {@link org.springframework.batch.core.step.tasklet.Tasklet#execute(org.springframework.batch.core.StepContribution, org.springframework.batch.core.scope.context.ChunkContext)}
+ * {@link org.springframework.batch.core.step.tasklet.Tasklet#execute(StepContribution, org.springframework.batch.core.scope.context.ChunkContext)}
* so the appropriate thread safety and visibility controls should be put in place.
*
* @author Will Schipp
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java
index 4499279e8e..041589b035 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.beans.factory.InitializingBean;
@@ -88,7 +88,7 @@ public class SystemCommandTasklet implements StepExecutionListener, StoppableTas
private volatile boolean stopped = false;
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
private boolean stoppable = false;
@@ -113,7 +113,7 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon
Thread.sleep(checkInterval);// moved to the end of the logic
if (stoppable) {
- JobExecution jobExecution = jobExplorer
+ JobExecution jobExecution = jobRepository
.getJobExecution(chunkContext.getStepContext().getStepExecution().getJobExecutionId());
if (jobExecution.isStopping()) {
@@ -201,11 +201,11 @@ public void afterPropertiesSet() throws Exception {
Assert.state(systemProcessExitCodeMapper != null, "SystemProcessExitCodeMapper must be set");
Assert.state(timeout > 0, "timeout value must be greater than zero");
Assert.state(taskExecutor != null, "taskExecutor is required");
- stoppable = jobExplorer != null;
+ stoppable = jobRepository != null;
}
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
+ public void setJobRepository(JobRepository jobRepository) {
+ this.jobRepository = jobRepository;
}
/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
index 651091eeaa..c0f9c6a56e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.step.tasklet;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
index aaf192beb2..6b5c01d85b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,11 +18,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.listener.CompositeChunkListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.scope.context.ChunkContext;
@@ -142,8 +142,8 @@ public void setTransactionAttribute(TransactionAttribute transactionAttribute) {
*/
public void setTasklet(Tasklet tasklet) {
this.tasklet = tasklet;
- if (tasklet instanceof StepExecutionListener) {
- registerStepExecutionListener((StepExecutionListener) tasklet);
+ if (tasklet instanceof StepExecutionListener stepExecutionListener) {
+ registerStepExecutionListener(stepExecutionListener);
}
}
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-5.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-5.0.xsd
new file mode 100644
index 0000000000..1c5b20f37c
--- /dev/null
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-5.0.xsd
@@ -0,0 +1,1368 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a job composed of a set of steps and
+ transitions between steps. The job will be exposed in
+ the enclosing
+ bean factory as a component of type Job
+ that can be launched using a
+ JobLauncher.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a stage in job processing backed by a
+ Step. The id attribute must be specified since this
+ step definition
+ will be referred to from other elements
+ to form a Job flow.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a flow composed of a set of steps and
+ transitions between steps.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A reference to a JobExecutionListener (or a POJO
+ if using before-job-method / after-job-method or
+ source level
+ annotations).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A bean definition for a step listener (or POJO if
+ using *-method attributes or source level
+ annotations)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a stage in job processing backed by a
+ Step. The id attribute must be specified. The
+ step
+ requires either
+ a chunk definition,
+ a tasklet reference, or a reference to a
+ (possibly abstract) parent step.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Declares job should split here into two or more
+ subflows.
+
+
+
+
+
+
+
+ A subflow within a job, having the same
+ format as a job, but without a separate identity.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Declares job should include an externalized flow
+ here.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Declares job should query a decider to determine
+ where execution should go next.
+
+
+
+
+
+
+
+
+ The decider is a reference to a
+ JobExecutionDecider that can produce a status to base
+ the next
+ transition on.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The tasklet is a reference to another bean
+ definition that implements
+ the Tasklet interface.
+
+
+
+
+
+
+
+
+
+ If the tasklet is specified as a bean definition, then a method can be specified and a POJO
+ will
+ be adapted to the Tasklet interface. The method suggested should have the same arguments
+ as Tasklet.execute (or a subset), and have a compatible return type (boolean, void or RepeatStatus).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ An exception class name.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Classify an exception as "included" in the set. Exceptions of this type or a subclass are
+ included.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Classify an exception as "excluded" from the
+ set. Exceptions of this type or a subclass are
+ excluded
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A reference to a listener, a POJO with a
+ listener-annotated method, or a POJO with
+ a method
+ referenced by a
+ *-method attribute.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a transition from this step to the
+ next
+ one depending on the value of the exit
+ status.
+
+
+
+
+
+ A pattern to match against the exit status
+ code. Use * and ? as wildcard characters. When a
+ step finishes
+ the most
+ specific match will be chosen to select the next step.
+ Hint:
+ always include a default
+ transition with on="*".
+
+
+
+
+
+
+ The name of the step to go to next. Must
+ resolve to one of the other steps in this job.
+
+
+
+
+
+
+
+
+ Declares job should be stop at this point and
+ provides pointer where execution should continue
+ when
+ the job is
+ restarted.
+
+
+
+
+
+ A pattern to match against the exit status
+ code. Use * and ? as wildcard characters.
+ When a step
+ finishes
+ the most specific match will be chosen to
+ select the next step.
+
+
+
+
+
+ The name of the step to start on when the
+ stopped job is restarted.
+ Must resolve to one of the
+ other steps
+ in this job.
+
+
+
+
+
+ The exit code value to end on, defaults to
+ STOPPED.
+
+
+
+
+
+
+
+ Declares job should end at this point, without
+ the possibility of restart.
+ BatchStatus will be
+ COMPLETED.
+ ExitStatus is configurable.
+
+
+
+
+
+ A pattern to match against the exit status
+ code. Use * and ? as wildcard characters.
+ When a step
+ finishes
+ the most specific match will be chosen to
+ select the next step.
+
+
+
+
+
+ The exit code value to end on, defaults to
+ COMPLETED.
+
+
+
+
+
+
+
+ Declares job should fail at this point.
+ BatchStatus will be FAILED. ExitStatus is configurable.
+
+
+
+
+
+ A pattern to match against the exit status
+ code. Use * and ? as wildcard characters.
+ When a step
+ finishes
+ the most specific match will be chosen to
+ select the next step.
+
+
+
+
+
+ The exit code value to end on, defaults to
+ FAILED.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The name of the parent bean from which the
+ configuration should inherit.
+
+
+
+
+
+
+
+
+
+
+
+
+ Is this bean "abstract", that is, not meant to be
+ instantiated itself
+ but rather just serving as
+ parent for concrete
+ child bean definitions?
+ The default is "false". Specify "true" to
+ tell the bean factory to not
+ try
+ to instantiate that particular bean
+ in any case.
+
+ Note: This attribute will not be inherited by child
+ bean definitions.
+ Hence, it needs to be specified per abstract bean
+ definition.
+
+
+
+
+
+
+
+
+
+ Should this list be merged with the corresponding
+ list provided
+ by the parent? If not, it will
+ overwrite the parent
+ list.
+
+
+
+
+
+
+
+
+
+ This attribute indicates the method from the
+ class that should
+ be used to dynamically create a
+ proxy.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd
index 1c5b20f37c..65e8ac5ef9 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd
@@ -6,7 +6,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tool https://www.springframework.org/schema/tool/spring-tool.xsd"
- version="5.0">
+ version="6.0">
@@ -80,7 +80,7 @@
-
+
@@ -265,20 +265,6 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
@@ -563,7 +549,7 @@
-
+
@@ -575,7 +561,7 @@
-
+
@@ -587,7 +573,7 @@
-
+
@@ -680,16 +666,6 @@
-
-
-
-
-
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-db2.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-derby.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-h2.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-hsqldb.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
index 56eaa20d15..ee6d1fcb30 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-mysql.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL DATETIME DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL DATETIME DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
index dd3d074daf..27f54d3f6c 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-oracle.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID NUMBER(19,0) NOT NULL ,
- TYPE_CD VARCHAR2(6) NOT NULL ,
- KEY_NAME VARCHAR2(100) NOT NULL ,
- STRING_VAL VARCHAR2(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL NUMBER(19,0) ,
- DOUBLE_VAL NUMBER ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID NUMBER(19,0) NOT NULL,
+ TYPE_CD VARCHAR2(6) NOT NULL,
+ KEY_NAME VARCHAR2(100) NOT NULL,
+ STRING_VAL VARCHAR2(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL NUMBER(19,0),
+ DOUBLE_VAL NUMBER,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-postgresql.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
index e52da193b6..fbb92b8168 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlf.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL TIMESTAMP DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL TIMESTAMP DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
index 4c24789ee8..e0cb8e524e 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sqlserver.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
- STRING_VAL VARCHAR(250) ,
- DATE_VAL DATETIME DEFAULT NULL ,
- LONG_VAL BIGINT ,
- DOUBLE_VAL DOUBLE PRECISION ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
+ STRING_VAL VARCHAR(250),
+ DATE_VAL DATETIME DEFAULT NULL,
+ LONG_VAL BIGINT,
+ DOUBLE_VAL DOUBLE PRECISION,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
index d8def25a63..cf0e5dafca 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/migration/2.2/migration-sybase.sql
@@ -1,15 +1,15 @@
-- create the requisite table
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- TYPE_CD VARCHAR(6) NOT NULL ,
- KEY_NAME VARCHAR(100) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ TYPE_CD VARCHAR(6) NOT NULL,
+ KEY_NAME VARCHAR(100) NOT NULL,
STRING_VAL VARCHAR(250) NULL,
DATE_VAL DATETIME DEFAULT NULL NULL,
LONG_VAL BIGINT NULL,
DOUBLE_VAL DOUBLE PRECISION NULL,
- IDENTIFYING CHAR(1) NOT NULL ,
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
index c883c354c9..11d10bad3c 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
index c9510a5bc3..e1cef9b9cb 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
+CREATE TABLE BATCH_JOB_INSTANCE (
JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
- VERSION BIGINT ,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
+CREATE TABLE BATCH_JOB_EXECUTION (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
- VERSION BIGINT ,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
+CREATE TABLE BATCH_STEP_EXECUTION (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
index dc51c373ca..5c33d838c0 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-h2.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT LONGVARCHAR ,
+ SERIALIZED_CONTEXT LONGVARCHAR,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT LONGVARCHAR ,
+ SERIALIZED_CONTEXT LONGVARCHAR,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
index 8dc2dc843c..50702acb36 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
+CREATE TABLE BATCH_JOB_INSTANCE (
JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
- VERSION BIGINT ,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
+CREATE TABLE BATCH_JOB_EXECUTION (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
- VERSION BIGINT ,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING VARCHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING VARCHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
+CREATE TABLE BATCH_STEP_EXECUTION (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
- CREATE_TIME TIMESTAMP NOT NULL ,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ CREATE_TIME TIMESTAMP NOT NULL,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
index 758699f152..09573c2a7b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
- CREATE_TIME TIMESTAMP(9) NOT NULL ,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ CREATE_TIME TIMESTAMP(9) NOT NULL,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT LONGVARCHAR ,
+ SERIALIZED_CONTEXT LONGVARCHAR,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT LONGVARCHAR ,
+ SERIALIZED_CONTEXT LONGVARCHAR,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
index 31f585fbc0..90e25c5d2b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mariadb.sql
@@ -1,72 +1,72 @@
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME DATETIME(6) NOT NULL,
- START_TIME DATETIME(6) DEFAULT NULL ,
- END_TIME DATETIME(6) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME DATETIME(6) DEFAULT NULL,
+ END_TIME DATETIME(6) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED DATETIME(6),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME DATETIME(6) NOT NULL,
- START_TIME DATETIME(6) DEFAULT NULL ,
- END_TIME DATETIME(6) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME DATETIME(6) DEFAULT NULL,
+ END_TIME DATETIME(6) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED DATETIME(6),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
index 197ef3ff02..e4de2b3277 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME DATETIME(6) NOT NULL,
- START_TIME DATETIME(6) DEFAULT NULL ,
- END_TIME DATETIME(6) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME DATETIME(6) DEFAULT NULL,
+ END_TIME DATETIME(6) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED DATETIME(6),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME DATETIME(6) NOT NULL,
- START_TIME DATETIME(6) DEFAULT NULL ,
- END_TIME DATETIME(6) DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME DATETIME(6) DEFAULT NULL,
+ END_TIME DATETIME(6) DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED DATETIME(6),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ENGINE=InnoDB;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ENGINE=InnoDB;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
index 73deea519e..a6344600e9 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID NUMBER(19,0) NOT NULL PRIMARY KEY ,
- VERSION NUMBER(19,0) ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
+ VERSION NUMBER(19,0),
JOB_NAME VARCHAR2(100 char) NOT NULL,
JOB_KEY VARCHAR2(32 char) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) SEGMENT CREATION IMMEDIATE;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY ,
- VERSION NUMBER(19,0) ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
+ VERSION NUMBER(19,0),
JOB_INSTANCE_ID NUMBER(19,0) NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR2(10 char) ,
- EXIT_CODE VARCHAR2(2500 char) ,
- EXIT_MESSAGE VARCHAR2(2500 char) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR2(10 char),
+ EXIT_CODE VARCHAR2(2500 char),
+ EXIT_MESSAGE VARCHAR2(2500 char),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) SEGMENT CREATION IMMEDIATE;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID NUMBER(19,0) NOT NULL ,
- PARAMETER_NAME VARCHAR(100 char) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100 char) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500 char) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID NUMBER(19,0) NOT NULL,
+ PARAMETER_NAME VARCHAR(100 char) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100 char) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500 char),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) SEGMENT CREATION IMMEDIATE;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
VERSION NUMBER(19,0) NOT NULL,
STEP_NAME VARCHAR2(100 char) NOT NULL,
JOB_EXECUTION_ID NUMBER(19,0) NOT NULL,
CREATE_TIME TIMESTAMP(9) NOT NULL,
- START_TIME TIMESTAMP(9) DEFAULT NULL ,
- END_TIME TIMESTAMP(9) DEFAULT NULL ,
- STATUS VARCHAR2(10 char) ,
- COMMIT_COUNT NUMBER(19,0) ,
- READ_COUNT NUMBER(19,0) ,
- FILTER_COUNT NUMBER(19,0) ,
- WRITE_COUNT NUMBER(19,0) ,
- READ_SKIP_COUNT NUMBER(19,0) ,
- WRITE_SKIP_COUNT NUMBER(19,0) ,
- PROCESS_SKIP_COUNT NUMBER(19,0) ,
- ROLLBACK_COUNT NUMBER(19,0) ,
- EXIT_CODE VARCHAR2(2500 char) ,
- EXIT_MESSAGE VARCHAR2(2500 char) ,
+ START_TIME TIMESTAMP(9) DEFAULT NULL,
+ END_TIME TIMESTAMP(9) DEFAULT NULL,
+ STATUS VARCHAR2(10 char),
+ COMMIT_COUNT NUMBER(19,0),
+ READ_COUNT NUMBER(19,0),
+ FILTER_COUNT NUMBER(19,0),
+ WRITE_COUNT NUMBER(19,0),
+ READ_SKIP_COUNT NUMBER(19,0),
+ WRITE_SKIP_COUNT NUMBER(19,0),
+ PROCESS_SKIP_COUNT NUMBER(19,0),
+ ROLLBACK_COUNT NUMBER(19,0),
+ EXIT_CODE VARCHAR2(2500 char),
+ EXIT_MESSAGE VARCHAR2(2500 char),
LAST_UPDATED TIMESTAMP(9),
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) SEGMENT CREATION IMMEDIATE;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR2(2500 char) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) SEGMENT CREATION IMMEDIATE;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID NUMBER(19,0) NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR2(2500 char) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) SEGMENT CREATION IMMEDIATE;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
index dd146f1f0f..585dc5773d 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT BIGINT ,
- READ_COUNT BIGINT ,
- FILTER_COUNT BIGINT ,
- WRITE_COUNT BIGINT ,
- READ_SKIP_COUNT BIGINT ,
- WRITE_SKIP_COUNT BIGINT ,
- PROCESS_SKIP_COUNT BIGINT ,
- ROLLBACK_COUNT BIGINT ,
- EXIT_CODE VARCHAR(2500) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT BIGINT,
+ READ_COUNT BIGINT,
+ FILTER_COUNT BIGINT,
+ WRITE_COUNT BIGINT,
+ READ_SKIP_COUNT BIGINT,
+ WRITE_SKIP_COUNT BIGINT,
+ PROCESS_SKIP_COUNT BIGINT,
+ ROLLBACK_COUNT BIGINT,
+ EXIT_CODE VARCHAR(2500),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT TEXT ,
+ SERIALIZED_CONTEXT TEXT,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
index 5a39c09e2a..8cf2582a6b 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlite.sql
@@ -1,74 +1,74 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
+CREATE TABLE BATCH_JOB_INSTANCE (
JOB_INSTANCE_ID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- VERSION INTEGER ,
+ VERSION INTEGER,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
+CREATE TABLE BATCH_JOB_EXECUTION (
JOB_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- VERSION INTEGER ,
+ VERSION INTEGER,
JOB_INSTANCE_ID INTEGER NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- EXIT_CODE VARCHAR(100) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ EXIT_CODE VARCHAR(100),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID INTEGER NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID INTEGER NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
+CREATE TABLE BATCH_STEP_EXECUTION (
STEP_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
VERSION INTEGER NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID INTEGER NOT NULL,
CREATE_TIME TIMESTAMP NOT NULL,
- START_TIME TIMESTAMP DEFAULT NULL ,
- END_TIME TIMESTAMP DEFAULT NULL ,
- STATUS VARCHAR(10) ,
- COMMIT_COUNT INTEGER ,
- READ_COUNT INTEGER ,
- FILTER_COUNT INTEGER ,
- WRITE_COUNT INTEGER ,
- READ_SKIP_COUNT INTEGER ,
- WRITE_SKIP_COUNT INTEGER ,
- PROCESS_SKIP_COUNT INTEGER ,
- ROLLBACK_COUNT INTEGER ,
- EXIT_CODE VARCHAR(100) ,
- EXIT_MESSAGE VARCHAR(2500) ,
+ START_TIME TIMESTAMP DEFAULT NULL,
+ END_TIME TIMESTAMP DEFAULT NULL,
+ STATUS VARCHAR(10),
+ COMMIT_COUNT INTEGER,
+ READ_COUNT INTEGER,
+ FILTER_COUNT INTEGER,
+ WRITE_COUNT INTEGER,
+ READ_SKIP_COUNT INTEGER,
+ WRITE_SKIP_COUNT INTEGER,
+ PROCESS_SKIP_COUNT INTEGER,
+ ROLLBACK_COUNT INTEGER,
+ EXIT_CODE VARCHAR(100),
+ EXIT_MESSAGE VARCHAR(2500),
LAST_UPDATED TIMESTAMP,
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID INTEGER NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
- SERIALIZED_CONTEXT CLOB ,
+ SERIALIZED_CONTEXT CLOB,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
index 70c89664c0..ca654183de 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
@@ -1,20 +1,20 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NULL,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME DATETIME NOT NULL,
- START_TIME DATETIME DEFAULT NULL ,
- END_TIME DATETIME DEFAULT NULL ,
+ START_TIME DATETIME DEFAULT NULL,
+ END_TIME DATETIME DEFAULT NULL,
STATUS VARCHAR(10) NULL,
EXIT_CODE VARCHAR(2500) NULL,
EXIT_MESSAGE VARCHAR(2500) NULL,
@@ -23,24 +23,24 @@ CREATE TABLE BATCH_JOB_EXECUTION (
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME DATETIME NOT NULL,
- START_TIME DATETIME DEFAULT NULL ,
- END_TIME DATETIME DEFAULT NULL ,
+ START_TIME DATETIME DEFAULT NULL,
+ END_TIME DATETIME DEFAULT NULL,
STATUS VARCHAR(10) NULL,
COMMIT_COUNT BIGINT NULL,
READ_COUNT BIGINT NULL,
@@ -57,7 +57,7 @@ CREATE TABLE BATCH_STEP_EXECUTION (
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
SERIALIZED_CONTEXT VARCHAR(MAX) NULL,
@@ -65,7 +65,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
SERIALIZED_CONTEXT VARCHAR(MAX) NULL,
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
index 15b221970e..131c0847a3 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
@@ -1,15 +1,15 @@
-- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE (
- JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_INSTANCE (
+ JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NULL,
JOB_NAME VARCHAR(100) NOT NULL,
JOB_KEY VARCHAR(32) NOT NULL,
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION (
- JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_JOB_EXECUTION (
+ JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME DATETIME NOT NULL,
@@ -23,18 +23,18 @@ CREATE TABLE BATCH_JOB_EXECUTION (
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
- JOB_EXECUTION_ID BIGINT NOT NULL ,
- PARAMETER_NAME VARCHAR(100) NOT NULL ,
- PARAMETER_TYPE VARCHAR(100) NOT NULL ,
- PARAMETER_VALUE VARCHAR(2500) ,
- IDENTIFYING CHAR(1) NOT NULL ,
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
+ JOB_EXECUTION_ID BIGINT NOT NULL,
+ PARAMETER_NAME VARCHAR(100) NOT NULL,
+ PARAMETER_TYPE VARCHAR(100) NOT NULL,
+ PARAMETER_VALUE VARCHAR(2500),
+ IDENTIFYING CHAR(1) NOT NULL,
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION (
- STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STEP_EXECUTION (
+ STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
@@ -57,7 +57,7 @@ CREATE TABLE BATCH_STEP_EXECUTION (
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
SERIALIZED_CONTEXT TEXT NULL,
@@ -65,7 +65,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
) ;
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
SERIALIZED_CONTEXT TEXT NULL,
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java
index f5e9983011..f9a1335a00 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java
@@ -20,9 +20,14 @@
import org.junit.jupiter.api.Test;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobKeyGenerator;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+
class DefaultJobKeyGeneratorTests {
- private final JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
+ private final JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator();
@Test
void testNullParameters() {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java
index 907ea62ff8..17a736d1db 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -33,6 +33,7 @@
/**
* @author Dave Syer
* @author Mahmoud Ben Hassine
+ * @author JiWon Seo
*
*/
class ExitStatusTests {
@@ -153,7 +154,7 @@ void testAddExitDescription() {
}
@Test
- void testAddExitDescriptionWIthStacktrace() {
+ void testAddExitDescriptionWithStacktrace() {
ExitStatus status = ExitStatus.EXECUTING.addExitDescription(new RuntimeException("Foo"));
assertNotSame(ExitStatus.EXECUTING, status);
String description = status.getExitDescription();
@@ -182,8 +183,15 @@ void testAddExitCodeWithDescription() {
}
@Test
- void testUnknownIsRunning() {
+ void testIsRunning() {
+ // running statuses
+ assertTrue(ExitStatus.EXECUTING.isRunning());
assertTrue(ExitStatus.UNKNOWN.isRunning());
+ // non running statuses
+ assertFalse(ExitStatus.COMPLETED.isRunning());
+ assertFalse(ExitStatus.FAILED.isRunning());
+ assertFalse(ExitStatus.STOPPED.isRunning());
+ assertFalse(ExitStatus.NOOP.isRunning());
}
@Test
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java
index 7fa33e9258..7be87bdfc5 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java
@@ -15,6 +15,8 @@
*/
package org.springframework.batch.core;
+import org.springframework.batch.core.job.JobExecutionException;
+
/**
* @author Dave Syer
*
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java
index 07f4d8a265..85c1519e69 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java
@@ -21,6 +21,10 @@
import org.junit.jupiter.api.Test;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.util.SerializationUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,7 +49,7 @@ void testJobExecution() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getEndTime()}.
+ * Test method for {@link JobExecution#getEndTime()}.
*/
@Test
void testGetEndTime() {
@@ -56,7 +60,7 @@ void testGetEndTime() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#isRunning()}.
+ * Test method for {@link JobExecution#isRunning()}.
*/
@Test
void testIsRunning() {
@@ -73,7 +77,7 @@ void testIsRunning() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStartTime()}.
+ * Test method for {@link JobExecution#getStartTime()}.
*/
@Test
void testGetStartTime() {
@@ -83,7 +87,7 @@ void testGetStartTime() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStatus()}.
+ * Test method for {@link JobExecution#getStatus()}.
*/
@Test
void testGetStatus() {
@@ -93,7 +97,7 @@ void testGetStatus() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStatus()}.
+ * Test method for {@link JobExecution#getStatus()}.
*/
@Test
void testUpgradeStatus() {
@@ -103,7 +107,7 @@ void testUpgradeStatus() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStatus()}.
+ * Test method for {@link JobExecution#getStatus()}.
*/
@Test
void testDowngradeStatus() {
@@ -113,7 +117,7 @@ void testDowngradeStatus() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getJobId()}.
+ * Test method for {@link JobExecution#getJobId()}.
*/
@Test
void testGetJobId() {
@@ -123,7 +127,7 @@ void testGetJobId() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getJobId()}.
+ * Test method for {@link JobExecution#getJobId()}.
*/
@Test
void testGetJobIdForNullJob() {
@@ -132,7 +136,7 @@ void testGetJobIdForNullJob() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getJobId()}.
+ * Test method for {@link JobExecution#getJobId()}.
*/
@Test
void testGetJob() {
@@ -140,8 +144,7 @@ void testGetJob() {
}
/**
- * Test method for
- * {@link org.springframework.batch.core.JobExecution#getExitStatus()}.
+ * Test method for {@link JobExecution#getExitStatus()}.
*/
@Test
void testGetExitCode() {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java
index a53f4dfcc5..aa8d3e91e2 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java
@@ -19,6 +19,8 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
+
+import org.springframework.batch.core.job.JobInstance;
import org.springframework.util.SerializationUtils;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java
index 43d76decd9..f535ede863 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java
@@ -15,6 +15,8 @@
*/
package org.springframework.batch.core;
+import org.springframework.batch.core.job.JobInterruptedException;
+
/**
* @author Dave Syer
*
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParameterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParameterTests.java
index ed830088f2..37be2c146b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParameterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParameterTests.java
@@ -23,6 +23,8 @@
import org.junit.jupiter.api.Test;
+import org.springframework.batch.core.job.parameters.JobParameter;
+
/**
* @author Lucas Ward
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java
index 220dfc4724..72acc40035 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2024 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -26,17 +26,15 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.job.SimpleJob;
-import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.job.*;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
/**
* @author Lucas Ward
@@ -51,8 +49,6 @@ class JobParametersBuilderTests {
private SimpleJob job;
- private JobExplorer jobExplorer;
-
private List jobInstanceList;
private List jobExecutionList;
@@ -62,10 +58,9 @@ class JobParametersBuilderTests {
@BeforeEach
void initialize() {
this.job = new SimpleJob("simpleJob");
- this.jobExplorer = mock();
this.jobInstanceList = new ArrayList<>(1);
this.jobExecutionList = new ArrayList<>(1);
- this.parametersBuilder = new JobParametersBuilder(this.jobExplorer);
+ this.parametersBuilder = new JobParametersBuilder();
}
@Test
@@ -159,90 +154,4 @@ void testAddJobParameter() {
assertEquals("bar", parameters.get("foo").getValue());
}
- @Test
- void testGetNextJobParametersFirstRun() {
- job.setJobParametersIncrementer(new RunIdIncrementer());
- initializeForNextJobParameters();
- this.parametersBuilder.getNextJobParameters(this.job);
- defaultNextJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
- }
-
- @Test
- void testGetNextJobParametersNoIncrementer() {
- initializeForNextJobParameters();
- final Exception expectedException = assertThrows(IllegalArgumentException.class,
- () -> this.parametersBuilder.getNextJobParameters(this.job));
- assertEquals("No job parameters incrementer found for job=simpleJob", expectedException.getMessage());
- }
-
- @Test
- void testGetNextJobParameters() {
- this.job.setJobParametersIncrementer(new RunIdIncrementer());
- this.jobInstanceList.add(new JobInstance(1L, "simpleJobInstance"));
- this.jobExecutionList.add(getJobExecution(this.jobInstanceList.get(0), null));
- when(this.jobExplorer.getJobInstances("simpleJob", 0, 1)).thenReturn(this.jobInstanceList);
- when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
- initializeForNextJobParameters();
- this.parametersBuilder.getNextJobParameters(this.job);
- defaultNextJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
- }
-
- @Test
- void testGetNextJobParametersRestartable() {
- this.job.setRestartable(true);
- this.job.setJobParametersIncrementer(new RunIdIncrementer());
- this.jobInstanceList.add(new JobInstance(1L, "simpleJobInstance"));
- this.jobExecutionList.add(getJobExecution(this.jobInstanceList.get(0), BatchStatus.FAILED));
- when(this.jobExplorer.getJobInstances("simpleJob", 0, 1)).thenReturn(this.jobInstanceList);
- when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
- initializeForNextJobParameters();
- this.parametersBuilder.addLong("NON_IDENTIFYING_LONG", 1L, false);
- this.parametersBuilder.getNextJobParameters(this.job);
- baseJobParametersVerify(this.parametersBuilder.toJobParameters(), 5);
- }
-
- @Test
- void testGetNextJobParametersNoPreviousExecution() {
- this.job.setJobParametersIncrementer(new RunIdIncrementer());
- this.jobInstanceList.add(new JobInstance(1L, "simpleJobInstance"));
- when(this.jobExplorer.getJobInstances("simpleJob", 0, 1)).thenReturn(this.jobInstanceList);
- when(this.jobExplorer.getJobExecutions(any())).thenReturn(this.jobExecutionList);
- initializeForNextJobParameters();
- this.parametersBuilder.getNextJobParameters(this.job);
- baseJobParametersVerify(this.parametersBuilder.toJobParameters(), 4);
- }
-
- @Test
- void testMissingJobExplorer() {
- this.parametersBuilder = new JobParametersBuilder();
- assertThrows(IllegalStateException.class, () -> this.parametersBuilder.getNextJobParameters(this.job));
- }
-
- private void initializeForNextJobParameters() {
- this.parametersBuilder.addDate("SCHEDULE_DATE", date);
- this.parametersBuilder.addLong("LONG", 1L);
- this.parametersBuilder.addString("STRING", "string value");
- }
-
- private void defaultNextJobParametersVerify(JobParameters parameters, int paramCount) {
- baseJobParametersVerify(parameters, paramCount);
- assertEquals(1, parameters.getLong("run.id"));
- }
-
- private void baseJobParametersVerify(JobParameters parameters, int paramCount) {
- assertEquals(date, parameters.getDate("SCHEDULE_DATE"));
- assertEquals(1L, parameters.getLong("LONG").longValue());
- assertEquals("string value", parameters.getString("STRING"));
- assertEquals(paramCount, parameters.getParameters().size());
- }
-
- private JobExecution getJobExecution(JobInstance jobInstance, BatchStatus batchStatus) {
- JobExecution jobExecution = new JobExecution(jobInstance, 1L, null);
- if (batchStatus != null) {
- jobExecution.setStatus(batchStatus);
- }
- return jobExecution;
-
- }
-
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java
index 28c70c7615..c26e860afe 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java
@@ -28,6 +28,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.util.SerializationUtils;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java
index c4fe2dcbf6..65287a5f89 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -20,8 +20,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.repeat.RepeatStatus;
@@ -47,7 +51,7 @@
public class SpringBatchVersionTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@@ -58,7 +62,7 @@ void testBatchVersionInExecutionContext() throws Exception {
JobParameters jobParameters = new JobParametersBuilder().toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncher.run(this.job, jobParameters);
+ JobExecution jobExecution = this.jobOperator.start(this.job, jobParameters);
// then
assertNotNull(jobExecution);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java
index c47fd72c0c..a4a38c2c2a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -50,7 +50,7 @@ void testBeanNameWithBeanDefinition() {
context.registerBeanDefinition("bean", new RootBeanDefinition(JobSupport.class, args, null));
context.refresh();
- JobSupport configuration = (JobSupport) context.getBean("bean");
+ JobSupport configuration = context.getBean("bean", JobSupport.class);
assertNotNull(configuration.getName());
assertEquals("foo", configuration.getName());
configuration.setBeanName("bar");
@@ -66,7 +66,7 @@ void testBeanNameWithParentBeanDefinition() {
context.registerBeanDefinition("parent", new RootBeanDefinition(JobSupport.class, args, null));
context.registerBeanDefinition("bean", new ChildBeanDefinition("parent"));
context.refresh();
- JobSupport configuration = (JobSupport) context.getBean("bean");
+ JobSupport configuration = context.getBean("bean", JobSupport.class);
assertNotNull(configuration.getName());
assertEquals("bar", configuration.getName());
configuration.setBeanName("foo");
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java
index cc39b005da..7a5269a20a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java
@@ -17,6 +17,9 @@
import org.junit.jupiter.api.Test;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java
index da2589236f..966ff8a70f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java
@@ -29,6 +29,13 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.util.SerializationUtils;
@@ -62,7 +69,7 @@ void testStepExecutionWithNullId() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getEndTime()}.
+ * Test method for {@link JobExecution#getEndTime()}.
*/
@Test
void testGetEndTime() {
@@ -84,7 +91,7 @@ void testGetCreateTime() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStatus()}.
+ * Test method for {@link JobExecution#getStatus()}.
*/
@Test
void testGetStatus() {
@@ -94,7 +101,7 @@ void testGetStatus() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getJobId()}.
+ * Test method for {@link JobExecution#getJobId()}.
*/
@Test
void testGetJobId() {
@@ -102,8 +109,7 @@ void testGetJobId() {
}
/**
- * Test method for
- * {@link org.springframework.batch.core.JobExecution#getExitStatus()}.
+ * Test method for {@link JobExecution#getExitStatus()}.
*/
@Test
void testGetExitCode() {
@@ -113,8 +119,7 @@ void testGetExitCode() {
}
/**
- * Test method for
- * {@link org.springframework.batch.core.StepExecution#getCommitCount()}.
+ * Test method for {@link StepExecution#getCommitCount()}.
*/
@Test
void testGetCommitCount() {
@@ -280,7 +285,7 @@ void testAddException() {
}
/**
- * Test method for {@link org.springframework.batch.core.JobExecution#getStatus()}.
+ * Test method for {@link JobExecution#getStatus()}.
*/
@Test
void testDowngradeStatus() {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java
index c8ce09889a..46fd03e979 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -24,22 +24,19 @@
import org.springframework.aop.Advisor;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobKeyGenerator;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobKeyGenerator;
import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
import org.springframework.batch.core.converter.JsonJobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
-import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
-import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
-import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
-import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobInstanceDao;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -58,32 +55,14 @@
*/
class BatchRegistrarTests {
- @Test
- @DisplayName("When no datasource is provided, then an BeanCreationException should be thrown")
- void testMissingDataSource() {
- Assertions.assertThrows(BeanCreationException.class,
- () -> new AnnotationConfigApplicationContext(JobConfigurationWithoutDataSource.class));
- }
-
- @Test
- @DisplayName("When no transaction manager is provided, then an BeanCreationException should be thrown")
- void testMissingTransactionManager() {
- Assertions.assertThrows(BeanCreationException.class,
- () -> new AnnotationConfigApplicationContext(JobConfigurationWithoutTransactionManager.class));
- }
-
@Test
@DisplayName("When custom beans are provided, then default ones should not be used")
void testConfigurationWithUserDefinedBeans() {
var context = new AnnotationConfigApplicationContext(JobConfigurationWithUserDefinedInfrastructureBeans.class);
Assertions.assertTrue(Mockito.mockingDetails(context.getBean(JobRepository.class)).isMock());
- Assertions.assertTrue(Mockito.mockingDetails(context.getBean(JobExplorer.class)).isMock());
- Assertions.assertTrue(Mockito.mockingDetails(context.getBean(JobLauncher.class)).isMock());
Assertions.assertTrue(Mockito.mockingDetails(context.getBean(JobRegistry.class)).isMock());
Assertions.assertTrue(Mockito.mockingDetails(context.getBean(JobOperator.class)).isMock());
- Assertions
- .assertTrue(Mockito.mockingDetails(context.getBean(JobRegistrySmartInitializingSingleton.class)).isMock());
}
@Test
@@ -161,21 +140,14 @@ void testDefaultInfrastructureBeansRegistration() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
// when
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
JobRepository jobRepository = context.getBean(JobRepository.class);
- JobExplorer jobExplorer = context.getBean(JobExplorer.class);
JobRegistry jobRegistry = context.getBean(JobRegistry.class);
JobOperator jobOperator = context.getBean(JobOperator.class);
- JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton = context
- .getBean(JobRegistrySmartInitializingSingleton.class);
// then
- Assertions.assertNotNull(jobLauncher);
Assertions.assertNotNull(jobRepository);
- Assertions.assertNotNull(jobExplorer);
Assertions.assertNotNull(jobRegistry);
Assertions.assertNotNull(jobOperator);
- Assertions.assertNotNull(jobRegistrySmartInitializingSingleton);
}
@Test
@@ -232,23 +204,6 @@ public void testCustomJobParametersConverterConfiguration() {
Assertions.assertEquals(JsonJobParametersConverter.class, jobParametersConverter.getClass());
}
- @Configuration
- @EnableBatchProcessing
- public static class JobConfigurationWithoutDataSource {
-
- }
-
- @Configuration
- @EnableBatchProcessing
- public static class JobConfigurationWithoutTransactionManager {
-
- @Bean
- public DataSource dataSource() {
- return Mockito.mock();
- }
-
- }
-
@Configuration
@EnableBatchProcessing
public static class JobConfigurationWithUserDefinedInfrastructureBeans {
@@ -258,16 +213,6 @@ public JobRepository jobRepository() {
return Mockito.mock();
}
- @Bean
- public JobExplorer jobExplorer() {
- return Mockito.mock();
- }
-
- @Bean
- public JobLauncher jobLauncher() {
- return Mockito.mock();
- }
-
@Bean
public JobRegistry jobRegistry() {
return Mockito.mock();
@@ -278,15 +223,11 @@ public JobOperator jobOperator() {
return Mockito.mock();
}
- @Bean
- public JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton() {
- return Mockito.mock();
- }
-
}
@Configuration
@EnableBatchProcessing
+ @EnableJdbcJobRepository
public static class JobConfiguration {
@Bean
@@ -305,7 +246,8 @@ public JdbcTransactionManager transactionManager(DataSource dataSource) {
}
@Configuration
- @EnableBatchProcessing(dataSourceRef = "batchDataSource", transactionManagerRef = "batchTransactionManager")
+ @EnableBatchProcessing(transactionManagerRef = "batchTransactionManager")
+ @EnableJdbcJobRepository(dataSourceRef = "batchDataSource", transactionManagerRef = "batchTransactionManager")
public static class JobConfigurationWithCustomBeanNames {
@Bean
@@ -325,6 +267,7 @@ public JdbcTransactionManager batchTransactionManager(DataSource dataSource) {
@Configuration
@EnableBatchProcessing
+ @EnableJdbcJobRepository
public static class CustomJobKeyGeneratorConfiguration {
@Bean
@@ -345,10 +288,10 @@ public JobKeyGenerator jobKeyGenerator() {
return new TestCustomJobKeyGenerator();
}
- private class TestCustomJobKeyGenerator implements JobKeyGenerator {
+ private static class TestCustomJobKeyGenerator implements JobKeyGenerator {
@Override
- public String generateKey(Object source) {
+ public String generateKey(JobParameters source) {
return "1";
}
@@ -358,6 +301,7 @@ public String generateKey(Object source) {
@Configuration
@EnableBatchProcessing
+ @EnableJdbcJobRepository
public static class CustomJobParametersConverterConfiguration {
@Bean
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java
index 5d94d737b1..176948fb91 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -21,11 +21,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.repeat.RepeatStatus;
@@ -49,8 +49,8 @@ class InlineDataSourceDefinitionTests {
void testInlineDataSourceDefinition() throws Exception {
ApplicationContext applicationContext = new AnnotationConfigApplicationContext(MyJobConfiguration.class);
Job job = applicationContext.getBean(Job.class);
- JobLauncher jobLauncher = applicationContext.getBean(JobLauncher.class);
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobOperator jobOperator = applicationContext.getBean(JobOperator.class);
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java
index 15abea0a85..9112204db2 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,14 +21,14 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.job.builder.SimpleJobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -86,8 +86,8 @@ private void testJob(String jobName, BatchStatus status, int stepExecutionCount,
configs[0] = DataSourceConfiguration.class;
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configs);
Job job = jobName == null ? context.getBean(Job.class) : context.getBean(jobName, Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
- JobExecution execution = jobLauncher.run(job,
+ JobOperator jobOperator = context.getBean(JobOperator.class);
+ JobExecution execution = jobOperator.start(job,
new JobParametersBuilder().addLong("run.id", (long) (Math.random() * Long.MAX_VALUE))
.toJobParameters());
assertEquals(status, execution.getStatus());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java
index d0e1bab83c..45c46d9251 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -22,19 +22,19 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.configuration.JobLocator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.configuration.support.ApplicationContextFactory;
import org.springframework.batch.core.configuration.support.AutomaticJobRegistrar;
import org.springframework.batch.core.configuration.support.GenericApplicationContextFactory;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.job.builder.SimpleJobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -71,9 +71,9 @@ private void testJob(String jobName, BatchStatus status, int stepExecutionCount,
System.arraycopy(config, 0, configs, 1, config.length);
configs[0] = DataSourceConfiguration.class;
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configs);
- Job job = jobName == null ? context.getBean(Job.class) : context.getBean(JobLocator.class).getJob(jobName);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
- JobExecution execution = jobLauncher.run(job,
+ Job job = jobName == null ? context.getBean(Job.class) : context.getBean(JobRegistry.class).getJob(jobName);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
+ JobExecution execution = jobOperator.start(job,
new JobParametersBuilder().addLong("run.id", (long) (Math.random() * Long.MAX_VALUE))
.toJobParameters());
assertEquals(status, execution.getStatus());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java
index af0b5fc1a6..1328c19622 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -22,9 +22,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.scope.context.JobSynchronizationManager;
import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -82,7 +82,7 @@ void testXmlJobScopeWithInheritance() throws Exception {
context = new ClassPathXmlApplicationContext(
"org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritance-context.xml");
JobSynchronizationManager.register(jobExecution);
- SimpleHolder value = (SimpleHolder) context.getBean("child");
+ SimpleHolder value = context.getBean("child", SimpleHolder.class);
assertEquals("JOB", value.call());
}
@@ -97,9 +97,9 @@ void testJobScopeWithProxyTargetClass() throws Exception {
void testStepScopeXmlImportUsingNamespace() throws Exception {
init(JobScopeConfigurationXmlImportUsingNamespace.class);
- SimpleHolder value = (SimpleHolder) context.getBean("xmlValue");
+ SimpleHolder value = context.getBean("xmlValue", SimpleHolder.class);
assertEquals("JOB", value.call());
- value = (SimpleHolder) context.getBean("javaValue");
+ value = context.getBean("javaValue", SimpleHolder.class);
assertEquals("JOB", value.call());
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java
index 5774e00314..b7f60b6d2e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -81,7 +81,7 @@ void testXmlStepScopeWithInheritance() throws Exception {
context = new ClassPathXmlApplicationContext(
"org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritance-context.xml");
StepSynchronizationManager.register(stepExecution);
- SimpleHolder value = (SimpleHolder) context.getBean("child");
+ SimpleHolder value = context.getBean("child", SimpleHolder.class);
assertEquals("STEP", value.call());
}
@@ -96,9 +96,9 @@ void testStepScopeWithProxyTargetClass() throws Exception {
void testStepScopeXmlImportUsingNamespace() throws Exception {
init(StepScopeConfigurationXmlImportUsingNamespace.class);
- SimpleHolder value = (SimpleHolder) context.getBean("xmlValue");
+ SimpleHolder value = context.getBean("xmlValue", SimpleHolder.class);
assertEquals("STEP", value.call());
- value = (SimpleHolder) context.getBean("javaValue");
+ value = context.getBean("javaValue", SimpleHolder.class);
assertEquals("STEP", value.call());
}
@@ -109,9 +109,9 @@ void testStepScopeXmlImportUsingNamespace() throws Exception {
public void testStepScopeUsingNamespaceAutoregisterBeans() throws Exception {
init(StepScopeConfigurationTestsUsingNamespaceAutoregisterBeans.class);
- ISimpleHolder value = (ISimpleHolder) context.getBean("xmlValue");
+ ISimpleHolder value = context.getBean("xmlValue", ISimpleHolder.class);
assertEquals("STEP", value.call());
- value = (ISimpleHolder) context.getBean("javaValue");
+ value = context.getBean("javaValue", ISimpleHolder.class);
assertEquals("STEP", value.call());
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java
index e12b9e8ffd..a24e1fb372 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java
@@ -69,8 +69,8 @@ private static class TestBeanPostProcessor implements BeanPostProcessor {
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (bean instanceof JobSupport) {
- ((JobSupport) bean).setName("bar");
+ if (bean instanceof JobSupport jobSupport) {
+ jobSupport.setName("bar");
}
return bean;
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarContextTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarContextTests.java
index 5af7467e00..240c39998e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarContextTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarContextTests.java
@@ -21,7 +21,7 @@
import java.util.Collection;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarTests.java
index 61112f4768..4d880b30e4 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarTests.java
@@ -17,6 +17,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -26,7 +27,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -58,7 +59,7 @@ void setUp() {
@Test
void testOrderedImplemented() {
- assertTrue(registrar instanceof Ordered);
+ assertInstanceOf(Ordered.class, registrar);
assertEquals(Ordered.LOWEST_PRECEDENCE, registrar.getOrder());
registrar.setOrder(1);
assertEquals(1, registrar.getOrder());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java
index b660c40b83..c216be342f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -23,21 +23,18 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.configuration.xml.DummyJobRepository;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -56,27 +53,15 @@ void testDefaultConfiguration() throws Exception {
// given
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(MyJobConfiguration.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
}
- @Test
- void testConfigurationWithoutDataSource() {
- Assertions.assertThrows(BeanCreationException.class,
- () -> new AnnotationConfigApplicationContext(MyJobConfigurationWithoutDataSource.class));
- }
-
- @Test
- void testConfigurationWithoutTransactionManager() {
- Assertions.assertThrows(BeanCreationException.class,
- () -> new AnnotationConfigApplicationContext(MyJobConfigurationWithoutTransactionManager.class));
- }
-
@Test
void testConfigurationWithCustomInfrastructureBean() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
@@ -85,9 +70,6 @@ void testConfigurationWithCustomInfrastructureBean() {
Assertions.assertEquals(1, jobRepositories.size());
JobRepository jobRepository = jobRepositories.entrySet().iterator().next().getValue();
Assertions.assertInstanceOf(DummyJobRepository.class, jobRepository);
- Map jobRegistrySmartInitializingSingletonMap = context
- .getBeansOfType(JobRegistrySmartInitializingSingleton.class);
- Assertions.assertEquals(1, jobRegistrySmartInitializingSingletonMap.size());
}
@Test
@@ -96,31 +78,14 @@ void testDefaultInfrastructureBeansRegistration() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(MyJobConfiguration.class);
// when
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
JobRepository jobRepository = context.getBean(JobRepository.class);
- JobExplorer jobExplorer = context.getBean(JobExplorer.class);
JobRegistry jobRegistry = context.getBean(JobRegistry.class);
JobOperator jobOperator = context.getBean(JobOperator.class);
- JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton = context
- .getBean(JobRegistrySmartInitializingSingleton.class);
// then
- Assertions.assertNotNull(jobLauncher);
Assertions.assertNotNull(jobRepository);
- Assertions.assertNotNull(jobExplorer);
Assertions.assertNotNull(jobRegistry);
Assertions.assertNotNull(jobOperator);
- Assertions.assertNotNull(jobRegistrySmartInitializingSingleton);
- }
-
- @Configuration
- static class MyJobConfigurationWithoutDataSource extends DefaultBatchConfiguration {
-
- }
-
- @Configuration
- static class MyJobConfigurationWithoutTransactionManager extends DefaultBatchConfiguration {
-
}
@Configuration
@@ -161,13 +126,6 @@ public JobRepository jobRepository() {
return new DummyJobRepository();
}
- @Bean
- public JobRegistrySmartInitializingSingleton jobRegistrySmartInitializingSingleton(JobRegistry jobRegistry) {
- JobRegistrySmartInitializingSingleton smartInitializingSingleton = new JobRegistrySmartInitializingSingleton();
- smartInitializingSingleton.setJobRegistry(jobRegistry);
- return smartInitializingSingleton;
- }
-
}
}
\ No newline at end of file
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java
index e0c3802992..84f13be9eb 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java
@@ -24,11 +24,11 @@
import java.util.Map;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.configuration.StepRegistry;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
index afc3b6dd75..02cdf62588 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
@@ -23,7 +23,7 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
@@ -189,18 +189,6 @@ void testDifferentResourceTypes() {
assertThrows(IllegalArgumentException.class, factory::createApplicationContext);
}
- @Test
- void testPackageScanning() {
- GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
- "org.springframework.batch.core.configuration.support");
- ConfigurableApplicationContext context = factory.createApplicationContext();
-
- assertEquals(context.getBean("bean1"), "bean1");
- assertEquals(context.getBean("bean2"), "bean2");
- assertEquals(context.getBean("bean3"), "bean3");
- assertEquals(context.getBean("bean4"), "bean4");
- }
-
@Test
void testMultipleConfigurationClasses() {
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(Configuration1.class,
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GroupAwareJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GroupAwareJobTests.java
index ad1af070fe..ae5286866b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GroupAwareJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GroupAwareJobTests.java
@@ -18,7 +18,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.job.JobSupport;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java
index d834a3e981..e55894c0ac 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,11 +18,13 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.JobFactory;
+import org.springframework.batch.core.test.repository.JobSupport;
/**
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
*
*/
class JobFactoryRegistrationListenerTests {
@@ -37,7 +39,7 @@ void testBind() throws Exception {
listener.bind(new JobFactory() {
@Override
public Job createJob() {
- return null;
+ return new JobSupport("foo");
}
@Override
@@ -54,7 +56,7 @@ void testUnbind() throws Exception {
listener.unbind(new JobFactory() {
@Override
public Job createJob() {
- return null;
+ return new JobSupport("foo");
}
@Override
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java
deleted file mode 100644
index a7913ed0b9..0000000000
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.core.configuration.support;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.Collection;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.job.JobSupport;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @author Dave Syer
- * @author Mahmoud Ben Hassine
- *
- */
-class JobRegistryBeanPostProcessorTests {
-
- private final JobRegistryBeanPostProcessor processor = new JobRegistryBeanPostProcessor();
-
- @Test
- void testInitializationFails() {
- Exception exception = assertThrows(IllegalStateException.class, processor::afterPropertiesSet);
- assertTrue(exception.getMessage().contains("JobRegistry"));
- }
-
- @Test
- void testBeforeInitialization() {
- // should be a no-op
- assertEquals("foo", processor.postProcessBeforeInitialization("foo", "bar"));
- }
-
- @Test
- void testAfterInitializationWithWrongType() {
- // should be a no-op
- assertEquals("foo", processor.postProcessAfterInitialization("foo", "bar"));
- }
-
- @Test
- void testAfterInitializationWithCorrectType() {
- MapJobRegistry registry = new MapJobRegistry();
- processor.setJobRegistry(registry);
- JobSupport job = new JobSupport();
- job.setBeanName("foo");
- assertNotNull(processor.postProcessAfterInitialization(job, "bar"));
- assertEquals("[foo]", registry.getJobNames().toString());
- }
-
- @Test
- void testAfterInitializationWithGroupName() {
- MapJobRegistry registry = new MapJobRegistry();
- processor.setJobRegistry(registry);
- processor.setGroupName("jobs");
- JobSupport job = new JobSupport();
- job.setBeanName("foo");
- assertNotNull(processor.postProcessAfterInitialization(job, "bar"));
- assertEquals("[jobs.foo]", registry.getJobNames().toString());
- }
-
- @Test
- void testAfterInitializationWithDuplicate() {
- MapJobRegistry registry = new MapJobRegistry();
- processor.setJobRegistry(registry);
- JobSupport job = new JobSupport();
- job.setBeanName("foo");
- processor.postProcessAfterInitialization(job, "bar");
- Exception exception = assertThrows(FatalBeanException.class,
- () -> processor.postProcessAfterInitialization(job, "spam"));
- assertTrue(exception.getCause() instanceof DuplicateJobException);
- }
-
- @Test
- void testUnregisterOnDestroy() throws Exception {
- MapJobRegistry registry = new MapJobRegistry();
- processor.setJobRegistry(registry);
- JobSupport job = new JobSupport();
- job.setBeanName("foo");
- assertNotNull(processor.postProcessAfterInitialization(job, "bar"));
- processor.destroy();
- assertEquals("[]", registry.getJobNames().toString());
- }
-
- @Test
- void testExecutionWithApplicationContext() throws Exception {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("test-context.xml", getClass());
- MapJobRegistry registry = (MapJobRegistry) context.getBean("registry");
- Collection configurations = registry.getJobNames();
- String[] names = context.getBeanNamesForType(JobSupport.class);
- int count = names.length;
- // Each concrete bean of type JobConfiguration is registered...
- assertEquals(count, configurations.size());
- // N.B. there is a failure / wonky mode where a parent bean is given an
- // explicit name or beanName (using property setter): in this case then
- // child beans will have the same name and will be re-registered (and
- // override, if the registry supports that).
- assertNotNull(registry.getJob("test-job"));
- assertEquals(context.getBean("test-job-with-name"), registry.getJob("foo"));
- assertEquals(context.getBean("test-job-with-bean-name"), registry.getJob("bar"));
- assertEquals(context.getBean("test-job-with-parent-and-name"), registry.getJob("spam"));
- assertEquals(context.getBean("test-job-with-parent-and-bean-name"), registry.getJob("bucket"));
- assertEquals(context.getBean("test-job-with-concrete-parent"), registry.getJob("maps"));
- assertEquals(context.getBean("test-job-with-concrete-parent-and-name"), registry.getJob("oof"));
- assertEquals(context.getBean("test-job-with-concrete-parent-and-bean-name"), registry.getJob("rab"));
- }
-
-}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryIntegrationTests.java
index 7586b62ebe..3f87b9f1fc 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,13 +18,14 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
*
*/
@SpringJUnitConfig
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingletonTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingletonTests.java
index f6db1e0187..d99bbfda65 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingletonTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingletonTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -20,17 +20,15 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.lenient;
@@ -40,6 +38,7 @@
* @author Henning Pöttker
* @author Mahmoud Ben Hassine
*/
+@SuppressWarnings("removal")
class JobRegistrySmartInitializingSingletonTests {
private final JobRegistry jobRegistry = new MapJobRegistry();
@@ -95,28 +94,4 @@ void testUnregisterOnDestroy() throws Exception {
assertTrue(jobRegistry.getJobNames().isEmpty());
}
- @Test
- void testExecutionWithApplicationContext() throws Exception {
- var context = new ClassPathXmlApplicationContext("test-context-with-smart-initializing-singleton.xml",
- getClass());
- var registry = context.getBean("registry", JobRegistry.class);
- Collection jobNames = registry.getJobNames();
- String[] names = context.getBeanNamesForType(JobSupport.class);
- int count = names.length;
- // Each concrete bean of type JobConfiguration is registered...
- assertEquals(count, jobNames.size());
- // N.B. there is a failure / wonky mode where a parent bean is given an
- // explicit name or beanName (using property setter): in this case then
- // child beans will have the same name and will be re-registered (and
- // override, if the registry supports that).
- assertNotNull(registry.getJob("test-job"));
- assertEquals(context.getBean("test-job-with-name"), registry.getJob("foo"));
- assertEquals(context.getBean("test-job-with-bean-name"), registry.getJob("bar"));
- assertEquals(context.getBean("test-job-with-parent-and-name"), registry.getJob("spam"));
- assertEquals(context.getBean("test-job-with-parent-and-bean-name"), registry.getJob("bucket"));
- assertEquals(context.getBean("test-job-with-concrete-parent"), registry.getJob("maps"));
- assertEquals(context.getBean("test-job-with-concrete-parent-and-name"), registry.getJob("oof"));
- assertEquals(context.getBean("test-job-with-concrete-parent-and-bean-name"), registry.getJob("rab"));
- }
-
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapJobRegistryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapJobRegistryTests.java
index d35c5ff7d9..a40965f599 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapJobRegistryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapJobRegistryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,21 +15,19 @@
*/
package org.springframework.batch.core.configuration.support;
-import java.util.Collection;
-
import org.junit.jupiter.api.Test;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.configuration.JobFactory;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.NoSuchJobException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Collection;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
*
*/
class MapJobRegistryTests {
@@ -38,7 +36,7 @@ class MapJobRegistryTests {
@Test
void testUnregister() throws Exception {
- registry.register(new ReferenceJobFactory(new JobSupport("foo")));
+ registry.register(new JobSupport("foo"));
assertNotNull(registry.getJob("foo"));
registry.unregister("foo");
Exception exception = assertThrows(NoSuchJobException.class, () -> registry.getJob("foo"));
@@ -47,28 +45,30 @@ void testUnregister() throws Exception {
@Test
void testReplaceDuplicateConfiguration() throws Exception {
- registry.register(new ReferenceJobFactory(new JobSupport("foo")));
- JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
- Exception exception = assertThrows(DuplicateJobException.class, () -> registry.register(jobFactory));
+ registry.register(new JobSupport("foo"));
+ Job job = new JobSupport("foo");
+ Exception exception = assertThrows(DuplicateJobException.class, () -> registry.register(job));
assertTrue(exception.getMessage().contains("foo"));
}
@Test
void testRealDuplicateConfiguration() throws Exception {
- JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
- registry.register(jobFactory);
- Exception exception = assertThrows(DuplicateJobException.class, () -> registry.register(jobFactory));
+ Job job = new JobSupport("foo");
+ registry.register(job);
+ Exception exception = assertThrows(DuplicateJobException.class, () -> registry.register(job));
assertTrue(exception.getMessage().contains("foo"));
}
@Test
void testGetJobConfigurations() throws Exception {
- JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
- registry.register(jobFactory);
- registry.register(new ReferenceJobFactory(new JobSupport("bar")));
+ Job job1 = new JobSupport("foo");
+ Job job2 = new JobSupport("bar");
+ registry.register(job1);
+ registry.register(job2);
Collection configurations = registry.getJobNames();
assertEquals(2, configurations.size());
- assertTrue(configurations.contains(jobFactory.getJobName()));
+ assertTrue(configurations.contains(job1.getName()));
+ assertTrue(configurations.contains(job2.getName()));
}
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapStepRegistryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapStepRegistryTests.java
index 394132cb31..518265fde1 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapStepRegistryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapStepRegistryTests.java
@@ -23,7 +23,7 @@
import java.util.HashSet;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.DuplicateJobException;
import org.springframework.batch.core.configuration.StepRegistry;
import org.springframework.batch.core.launch.NoSuchJobException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/AbstractJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/AbstractJobParserTests.java
index d22a663a74..14dcd6ce6c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/AbstractJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/AbstractJobParserTests.java
@@ -19,10 +19,10 @@
import org.junit.jupiter.api.BeforeEach;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
index dfbc44e4aa..7ca3c6764d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java
index c973344bd6..9ae42b196b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java
@@ -22,7 +22,7 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.item.SimpleChunkProcessor;
import org.springframework.batch.core.step.skip.SkipPolicy;
import org.springframework.batch.core.step.tasklet.TaskletStep;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java
index f8b89f76b0..e06c0d9b41 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java
@@ -20,10 +20,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
index b50661c214..8121054513 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
index 3859bf4968..842e0df10b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
@@ -20,8 +20,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultUnknownJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultUnknownJobParserTests.java
index 8a6ee6d6cd..c768f78760 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultUnknownJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultUnknownJobParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.lang.Nullable;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyChunkListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyChunkListener.java
index 88dc428693..89f2df5f28 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyChunkListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyChunkListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.ChunkListener;
+import org.springframework.batch.core.listener.ChunkListener;
/**
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobExecutionListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobExecutionListener.java
index 81898be730..350cbf4a7b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobExecutionListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.JobExecutionListener;
+import org.springframework.batch.core.listener.JobExecutionListener;
/**
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java
index b6745f7c19..a79f2af2c9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java
@@ -17,10 +17,10 @@
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
@@ -81,6 +81,7 @@ public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
return 0;
}
+ @SuppressWarnings("removal")
@Override
public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
return false;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java
index 8b59289a05..d3c99b12c6 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.beans.factory.BeanNameAware;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStepExecutionListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStepExecutionListener.java
index 2479d50856..da077ce582 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStepExecutionListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStepExecutionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2025 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
/**
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java
index aefe4480b6..4cfc78c19a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
index 5a1ee0ca6d..2aa37f0fca 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
index 5cf04b2469..4452dd9114 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
index 17fabe7979..7475838888 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
index aae2910a6b..aad0d7f89c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java
index 3935809b29..8c346f3a72 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java
index f204a28825..ba221ca4cf 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java
index 2ee4e500a0..97a55e82cf 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
index 5acc06b074..2153226933 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.adapter.ItemProcessorAdapter;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java
index 54ad4111a7..f25827d724 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests.java
index 2814f7bcb1..81d7fe56fc 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests.java
@@ -18,9 +18,9 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests.java
index 8f9d3a195d..ab1475053d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests.java
@@ -18,9 +18,9 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.annotation.AfterJob;
import org.springframework.batch.core.annotation.BeforeJob;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests.java
index d04c078171..51aa57ee1e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,8 +23,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionListener;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.listener.JobExecutionListener;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java
index 54e3b79887..9fbb1d7188 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobParserValidatorTests.java
@@ -23,12 +23,12 @@
import java.util.Collection;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
import org.springframework.batch.core.job.AbstractJob;
-import org.springframework.batch.core.job.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java
index 9c6f4cf623..40f3a07ec9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,8 +18,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.configuration.ListableJobLocator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@@ -34,7 +34,7 @@
public class JobRegistryJobParserTests implements ApplicationContextAware {
@Autowired
- private ListableJobLocator jobRegistry;
+ private JobRegistry jobRegistry;
private ApplicationContext applicationContext;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.java
index dff6c73368..f96b5b9d91 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java
index 9299154c38..aa30a73bac 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -17,9 +17,9 @@
import java.util.List;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests.java
index f097fb88ce..75ed2061f9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java
index d510ca3f4c..cee92506e3 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeUnknownJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeUnknownJobParserTests.java
index 3720442df6..d415a4183a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeUnknownJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeUnknownJobParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.lang.Nullable;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NoopTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NoopTasklet.java
index 25e37694e8..91821305ec 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NoopTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NoopTasklet.java
@@ -16,7 +16,7 @@
package org.springframework.batch.core.configuration.xml;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/OneStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/OneStepJobParserTests.java
index f1a470d2fc..cbafd2bf9e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/OneStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/OneStepJobParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests.java
index 9913385164..72042011c9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests.java
@@ -19,7 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.item.FaultTolerantChunkProcessor;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java
index 263a59b701..84ee4830e6 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -28,14 +28,14 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.partition.StepExecutionSplitter;
-import org.springframework.batch.core.partition.support.PartitionStep;
-import org.springframework.batch.core.partition.support.StepExecutionAggregator;
+import org.springframework.batch.core.partition.PartitionStep;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.TaskletStep;
@@ -145,7 +145,7 @@ void testNestedPartitionStepStepReference() throws Throwable {
String stepExecutionName = se.getStepName();
// the partitioned step
if (stepExecutionName.equalsIgnoreCase("j3s1")) {
- PartitionStep partitionStep = (PartitionStep) this.applicationContext.getBean(stepExecutionName);
+ PartitionStep partitionStep = this.applicationContext.getBean(stepExecutionName, PartitionStep.class);
// prove that the reference in the {@link
// TaskExecutorPartitionHandler} is the step configured inline
TaskExecutorPartitionHandler taskExecutorPartitionHandler = accessPrivateField(partitionStep,
@@ -184,7 +184,7 @@ void testNestedPartitionStep() throws Throwable {
String stepExecutionName = se.getStepName();
if (stepExecutionName.equalsIgnoreCase("j4s1")) { // the partitioned
// step
- PartitionStep partitionStep = (PartitionStep) this.applicationContext.getBean(stepExecutionName);
+ PartitionStep partitionStep = this.applicationContext.getBean(stepExecutionName, PartitionStep.class);
// prove that the reference in the {@link
// TaskExecutorPartitionHandler} is the step configured inline
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java
index a2391387a4..3cfddf378c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.batch.core.repository.JobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithLateBindingParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithLateBindingParserTests.java
index ee6c0fb2c5..42eb76f253 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithLateBindingParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithLateBindingParserTests.java
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithNonDefaultTransactionManagerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithNonDefaultTransactionManagerParserTests.java
index 9508171ecd..5fd3030261 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithNonDefaultTransactionManagerParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithNonDefaultTransactionManagerParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests.java
index 0a8cad596e..75f56c10f8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
index 79e04e3a94..c9ec64a409 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
@@ -20,8 +20,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
index 97ece09a08..a4595bf6bc 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java
index 202febb595..3531792e40 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitJobParserTests.java
index 85240859b7..21efe906c9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitJobParserTests.java
@@ -23,9 +23,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitNestedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitNestedJobParserTests.java
index ed59f4cb29..a092b10d46 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitNestedJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitNestedJobParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java
index caf6f2f99c..c42c54caee 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -23,8 +23,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.core.step.tasklet.TaskletStep;
import org.springframework.beans.factory.BeanFactory;
@@ -45,7 +45,7 @@ class StepListenerInStepParserTests {
@Test
void testListenersAtStepLevel() throws Exception {
- Step step = (Step) beanFactory.getBean("s1");
+ Step step = beanFactory.getBean("s1", Step.class);
List list = getListeners(step);
assertEquals(1, list.size());
assertTrue(list.get(0) instanceof DummyStepExecutionListener);
@@ -54,7 +54,7 @@ void testListenersAtStepLevel() throws Exception {
@Test
// TODO: BATCH-1689 (expected=BeanCreationException.class)
void testListenersAtStepLevelWrongType() throws Exception {
- Step step = (Step) beanFactory.getBean("s2");
+ Step step = beanFactory.getBean("s2", Step.class);
List list = getListeners(step);
assertEquals(1, list.size());
assertTrue(list.get(0) instanceof DummyChunkListener);
@@ -62,7 +62,7 @@ void testListenersAtStepLevelWrongType() throws Exception {
@Test
void testListenersAtTaskletAndStepLevels() throws Exception {
- Step step = (Step) beanFactory.getBean("s3");
+ Step step = beanFactory.getBean("s3", Step.class);
List list = getListeners(step);
assertEquals(2, list.size());
assertTrue(list.get(0) instanceof DummyStepExecutionListener);
@@ -71,7 +71,7 @@ void testListenersAtTaskletAndStepLevels() throws Exception {
@Test
void testListenersAtChunkAndStepLevels() throws Exception {
- Step step = (Step) beanFactory.getBean("s4");
+ Step step = beanFactory.getBean("s4", Step.class);
List list = getListeners(step);
assertEquals(2, list.size());
assertTrue(list.get(0) instanceof DummyStepExecutionListener);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java
index 95306b992d..da931c25bc 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -23,8 +23,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.step.tasklet.TaskletStep;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java
index 0a257e01d1..3c117021a7 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -23,8 +23,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.listener.CompositeStepExecutionListener;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.core.step.tasklet.TaskletStep;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepNameTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepNameTests.java
index 6932f31c12..82550d788e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepNameTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepNameTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,7 +27,7 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -61,7 +61,7 @@ void testStepNames(Resource resource) throws Exception {
for (String name : stepLocators.keySet()) {
StepLocator stepLocator = stepLocators.get(name);
Collection stepNames = stepLocator.getStepNames();
- Job job = (Job) context.getBean(name);
+ Job job = context.getBean(name, Job.class);
String jobName = job.getName();
assertFalse(stepNames.isEmpty(), "Job has no steps: " + jobName);
for (String registeredName : stepNames) {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java
index 37949ce5fd..8d0136f47e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
+import org.springframework.batch.core.listener.StepListener;
import org.springframework.batch.core.job.flow.FlowStep;
import org.springframework.batch.core.job.flow.support.SimpleFlow;
import org.springframework.batch.core.partition.PartitionHandler;
-import org.springframework.batch.core.partition.support.PartitionStep;
+import org.springframework.batch.core.partition.PartitionStep;
import org.springframework.batch.core.partition.support.SimplePartitioner;
import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler;
import org.springframework.batch.core.step.JobRepositorySupport;
@@ -239,7 +239,6 @@ void testFaultTolerantStep() throws Exception {
fb.setIsReaderTransactionalQueue(true);
fb.setRetryLimit(5);
fb.setSkipLimit(100);
- fb.setThrottleLimit(10);
fb.setRetryListeners(new RetryListener() {
});
@SuppressWarnings("unchecked")
@@ -251,7 +250,7 @@ void testFaultTolerantStep() throws Exception {
assertTrue(step instanceof TaskletStep);
Object throttleLimit = ReflectionTestUtils.getField(ReflectionTestUtils.getField(step, "stepOperations"),
"throttleLimit");
- assertEquals(10, throttleLimit);
+ assertEquals(4, throttleLimit);
Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
assertTrue(tasklet instanceof ChunkOrientedTasklet);
assertFalse((Boolean) ReflectionTestUtils.getField(tasklet, "buffering"));
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
index 541e402264..2f61eeea5f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -28,8 +28,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.listener.CompositeStepExecutionListener;
import org.springframework.batch.core.repository.JobRepository;
@@ -88,8 +88,6 @@ void testTaskletStepAttributes() throws Exception {
StepParserStepFactoryBean factory = beans.get(factoryName);
TaskletStep bean = (TaskletStep) factory.getObject();
assertEquals(25, bean.getStartLimit(), "wrong start-limit:");
- Object throttleLimit = ReflectionTestUtils.getField(factory, "throttleLimit");
- assertEquals(10, throttleLimit);
}
@Test
@@ -98,7 +96,7 @@ void testStepParserBeanName() {
"org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml");
Map beans = ctx.getBeansOfType(Step.class);
assertTrue(beans.containsKey("s1"), "'s1' bean not found");
- Step s1 = (Step) ctx.getBean("s1");
+ Step s1 = ctx.getBean("s1", Step.class);
assertEquals("s1", s1.getName(), "wrong name");
}
@@ -114,7 +112,7 @@ void testStepParserCommitInterval() throws Exception {
"org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml");
Map beans = ctx.getBeansOfType(Step.class);
assertTrue(beans.containsKey("s1"), "'s1' bean not found");
- Step s1 = (Step) ctx.getBean("s1");
+ Step s1 = ctx.getBean("s1", Step.class);
CompletionPolicy completionPolicy = getCompletionPolicy(s1);
assertTrue(completionPolicy instanceof SimpleCompletionPolicy);
assertEquals(25, ReflectionTestUtils.getField(completionPolicy, "chunkSize"));
@@ -126,7 +124,7 @@ void testStepParserCompletionPolicy() throws Exception {
"org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml");
Map beans = ctx.getBeansOfType(Step.class);
assertTrue(beans.containsKey("s1"), "'s1' bean not found");
- Step s1 = (Step) ctx.getBean("s1");
+ Step s1 = ctx.getBean("s1", Step.class);
CompletionPolicy completionPolicy = getCompletionPolicy(s1);
assertTrue(completionPolicy instanceof DummyCompletionPolicy);
}
@@ -212,7 +210,7 @@ private void validateTransactionAttributesInherited(String stepName, Application
@SuppressWarnings("unchecked")
private List getListeners(String stepName, ApplicationContext ctx) throws Exception {
assertTrue(ctx.containsBean(stepName));
- Step step = (Step) ctx.getBean(stepName);
+ Step step = ctx.getBean(stepName, Step.class);
assertTrue(step instanceof TaskletStep);
Object compositeListener = ReflectionTestUtils.getField(step, "stepExecutionListener");
Object composite = ReflectionTestUtils.getField(compositeListener, "list");
@@ -236,7 +234,7 @@ private StepExecutionListener getListener(String stepName, ApplicationContext ct
private DefaultTransactionAttribute getTransactionAttribute(ApplicationContext ctx, String stepName) {
assertTrue(ctx.containsBean(stepName));
- Step step = (Step) ctx.getBean(stepName);
+ Step step = ctx.getBean(stepName, Step.class);
assertTrue(step instanceof TaskletStep);
Object transactionAttribute = ReflectionTestUtils.getField(step, "transactionAttribute");
return (DefaultTransactionAttribute) transactionAttribute;
@@ -252,7 +250,7 @@ void testInheritFromBean() {
private Tasklet getTasklet(String stepName, ApplicationContext ctx) {
assertTrue(ctx.containsBean(stepName));
- Step step = (Step) ctx.getBean(stepName);
+ Step step = ctx.getBean(stepName, Step.class);
assertTrue(step instanceof TaskletStep);
Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
assertTrue(tasklet instanceof Tasklet);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests.java
index 2ad66f701d..829776a52f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.item.ItemStream;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
index 169b58aea5..3c33d19d4c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.item.ItemStream;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests.java
index 3d50e524d0..3255444c42 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests.java
@@ -21,9 +21,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java
index bafa0abeb9..808d4e49d8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java
@@ -22,10 +22,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.FlowJob;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.TaskletStep;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java
index 525e2ba2a1..86b65cff11 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java
@@ -20,8 +20,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java
index 6f30120f30..219896fd9d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java
@@ -19,8 +19,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartWithCustomExitCodeJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartWithCustomExitCodeJobParserTests.java
index 375e21bb27..6dcee7f325 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartWithCustomExitCodeJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartWithCustomExitCodeJobParserTests.java
@@ -18,8 +18,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java
index e824cd75d9..b0e223b724 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java
@@ -19,8 +19,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
index b5e4b8183a..36dd0f289a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
@@ -19,8 +19,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
index f05c0b6cba..098468a562 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
index 4fa77cfc13..c7672d1f95 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
@@ -20,8 +20,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
index 128e018b9b..6bf45eb632 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
@@ -20,8 +20,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserAdapterTests.java
index 16da4b2237..495e1fdc55 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserAdapterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserAdapterTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java
index cc19f41faf..6342f79c77 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java
@@ -19,10 +19,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.flow.FlowJob;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.TaskletStep;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTests.java
index 11823defd7..75a6d3e2ef 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2025 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.
@@ -19,9 +19,9 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +46,7 @@ class TaskletStepAllowStartIfCompleteTests {
@Test
void test() throws Exception {
// retrieve the step from the context and see that it's allow is set
- AbstractStep abstractStep = (AbstractStep) context.getBean("simpleJob.step1");
+ AbstractStep abstractStep = context.getBean("simpleJob.step1", AbstractStep.class);
assertTrue(abstractStep.isAllowStartIfComplete());
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java
index e60356ccbc..e5796f1525 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -16,8 +16,8 @@
package org.springframework.batch.core.configuration.xml;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.lang.Nullable;
public class TestCustomStatusListener extends AbstractTestComponent implements StepExecutionListener {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java
index 97927c9444..4bcc6957ea 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
import org.springframework.lang.Nullable;
public class TestIncrementer implements JobParametersIncrementer {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
index fecb31502d..c5489a053a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -16,8 +16,8 @@
package org.springframework.batch.core.configuration.xml;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.annotation.AfterRead;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java
index cab9cf1e91..4b123fe2ba 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests.java
index c8e8d755e0..e6c63570a8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java
index d39b9ad5eb..e573447179 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java
@@ -20,9 +20,9 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.util.StringUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JobParametersConverterSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JobParametersConverterSupport.java
index c28bdff263..6038ef378f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JobParametersConverterSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JobParametersConverterSupport.java
@@ -18,9 +18,9 @@
import java.util.Map;
import java.util.Properties;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.lang.Nullable;
public class JobParametersConverterSupport implements JobParametersConverter {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JsonJobParametersConverterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JsonJobParametersConverterTests.java
index 82b168b059..0f60717a07 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JsonJobParametersConverterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/JsonJobParametersConverterTests.java
@@ -18,7 +18,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameter;
/**
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java
index a36229a824..d8194ee137 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -17,6 +17,7 @@
import javax.sql.DataSource;
+import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -24,9 +25,11 @@
import org.springframework.aop.Advisor;
import org.springframework.aop.framework.Advised;
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobKeyGenerator;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobKeyGenerator;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.explore.JobExplorer;
+import org.springframework.batch.core.repository.explore.support.JobExplorerFactoryBean;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.util.ReflectionTestUtils;
@@ -46,6 +49,7 @@
* @author Mahmoud Ben Hassine
*
*/
+@SuppressWarnings("removal")
class JobExplorerFactoryBeanTests {
private JobExplorerFactoryBean factory;
@@ -146,10 +150,10 @@ public void testCustomJobKeyGenerator() throws Exception {
Assertions.assertEquals(CustomJobKeyGenerator.class, jobKeyGenerator.getClass());
}
- class CustomJobKeyGenerator implements JobKeyGenerator {
+ static class CustomJobKeyGenerator implements JobKeyGenerator {
@Override
- public String generateKey(String source) {
+ public @NotNull String generateKey(@NotNull JobParameters source) {
return "1";
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java
index 57f990bc21..e0808765b0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 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.
@@ -24,18 +24,19 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
import org.springframework.batch.core.configuration.xml.DummyStep;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.FlowStep;
@@ -43,11 +44,12 @@
import org.springframework.batch.core.job.flow.support.StateTransition;
import org.springframework.batch.core.job.flow.support.state.EndState;
import org.springframework.batch.core.job.flow.support.state.StepState;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.batch.core.repository.explore.support.JobExplorerFactoryBean;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@@ -80,6 +82,7 @@ class SimpleJobExplorerIntegrationTests {
*/
@Configuration
@EnableBatchProcessing
+ @EnableJdbcJobRepository
static class Config {
@Bean
@@ -87,6 +90,7 @@ public JobExplorer jobExplorer() throws Exception {
return jobExplorerFactoryBean().getObject();
}
+ @SuppressWarnings("removal")
@Bean
public JobExplorerFactoryBean jobExplorerFactoryBean() {
JobExplorerFactoryBean jobExplorerFactoryBean = new JobExplorerFactoryBean();
@@ -146,7 +150,7 @@ public Job job(JobRepository jobRepository) {
private FlowStep flowStep;
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@@ -170,7 +174,7 @@ void testGetStepExecution() throws JobExecutionAlreadyRunningException, JobResta
@Test
void getLastJobExecutionShouldFetchStepExecutions() throws Exception {
- this.jobLauncher.run(this.job, new JobParameters());
+ this.jobOperator.start(this.job, new JobParameters());
JobInstance lastJobInstance = this.jobExplorer.getLastJobInstance("job");
JobExecution lastJobExecution = this.jobExplorer.getLastJobExecution(lastJobInstance);
assertEquals(1, lastJobExecution.getStepExecutions().size());
@@ -186,6 +190,7 @@ void getLastJobExecutionShouldFetchStepExecutions() throws Exception {
@Configuration
@EnableBatchProcessing
+ @EnableJdbcJobRepository
static class JobConfiguration {
@Bean
@@ -219,7 +224,7 @@ public JdbcTransactionManager transactionManager(DataSource dataSource) {
void retrievedJobExecutionsShouldHaveTheirOwnParameters() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
JobExplorer jobExplorer = context.getBean(JobExplorer.class);
Job job = context.getBean(Job.class);
long id = 1L;
@@ -231,8 +236,8 @@ void retrievedJobExecutionsShouldHaveTheirOwnParameters() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution1 = jobLauncher.run(job, jobParameters1);
- JobExecution jobExecution2 = jobLauncher.run(job, jobParameters2);
+ JobExecution jobExecution1 = jobOperator.start(job, jobParameters1);
+ JobExecution jobExecution2 = jobOperator.start(job, jobParameters2);
// then
Assertions.assertEquals(jobExecution1.getJobInstance(), jobExecution2.getJobInstance());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerTests.java
index 7e7122d0b0..49fd8b0551 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerTests.java
@@ -27,15 +27,16 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
import org.springframework.batch.core.repository.dao.JobExecutionDao;
import org.springframework.batch.core.repository.dao.JobInstanceDao;
import org.springframework.batch.core.repository.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.explore.support.SimpleJobExplorer;
/**
* Test {@link SimpleJobExplorer}.
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java
index 93694fc764..0b9b3aceaf 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java
@@ -23,9 +23,11 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
+
+import org.springframework.batch.core.job.parameters.CompositeJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
class CompositeJobParametersValidatorTests {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java
index ccd88adb99..b5e1971772 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java
@@ -16,9 +16,11 @@
package org.springframework.batch.core.job;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersInvalidException;
+
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java
index 79a5684b1f..cbcdc661bd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java
@@ -18,15 +18,13 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -60,7 +58,7 @@ void setUp() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
factory.afterPropertiesSet();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
index c5e32aa0f1..9a313389fb 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
@@ -21,11 +21,9 @@
import java.util.List;
import java.util.Map;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersValidator;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.NoSuchStepException;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.beans.factory.BeanNameAware;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java
index ae96ea0182..e1ec6449cd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java
@@ -22,14 +22,11 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -55,7 +52,7 @@ void init() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
factory.afterPropertiesSet();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
index c850e8c77f..93c49c5dbb 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -35,20 +35,14 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.observability.BatchJobObservation;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -75,8 +69,6 @@ class SimpleJobTests {
private JobRepository jobRepository;
- private JobExplorer jobExplorer;
-
private final List list = new ArrayList<>();
private JobInstance jobInstance;
@@ -103,16 +95,11 @@ void setUp() throws Exception {
.generateUniqueName(true)
.build();
JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase);
- JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean repositoryFactoryBean = new JdbcJobRepositoryFactoryBean();
repositoryFactoryBean.setDataSource(embeddedDatabase);
repositoryFactoryBean.setTransactionManager(transactionManager);
repositoryFactoryBean.afterPropertiesSet();
this.jobRepository = repositoryFactoryBean.getObject();
- JobExplorerFactoryBean explorerFactoryBean = new JobExplorerFactoryBean();
- explorerFactoryBean.setDataSource(embeddedDatabase);
- explorerFactoryBean.setTransactionManager(transactionManager);
- explorerFactoryBean.afterPropertiesSet();
- this.jobExplorer = explorerFactoryBean.getObject();
job = new SimpleJob();
job.setJobRepository(jobRepository);
@@ -159,7 +146,7 @@ void testGetSteps() {
}
/**
- * Test method for {@link SimpleJob#addStep(org.springframework.batch.core.Step)}.
+ * Test method for {@link SimpleJob#addStep(Step)}.
*/
@Test
void testAddStep() {
@@ -178,7 +165,7 @@ void testExitStatusReturned() {
Step testStep = new Step() {
@Override
- public void execute(StepExecution stepExecution) throws JobInterruptedException {
+ public void execute(StepExecution stepExecution) {
stepExecution.setExitStatus(customStatus);
}
@@ -192,10 +179,6 @@ public int getStartLimit() {
return 1;
}
- @Override
- public boolean isAllowStartIfComplete() {
- return false;
- }
};
List steps = new ArrayList<>();
steps.add(testStep);
@@ -494,10 +477,10 @@ void testGetMultipleJobParameters() throws Exception {
JobExecution jobexecution = jobRepository.createJobExecution(job.getName(), firstJobParameters);
job.execute(jobexecution);
- List jobExecutionList = jobExplorer.getJobExecutions(jobexecution.getJobInstance());
+ List jobExecutionList = jobRepository.getJobExecutions(jobexecution.getJobInstance());
- assertEquals(jobExecutionList.size(), 1);
- assertEquals(jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"), "first");
+ assertEquals(1, jobExecutionList.size());
+ assertEquals("first", jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"));
JobParameters secondJobParameters = new JobParametersBuilder()
.addString("JobExecutionParameter", "second", false)
@@ -505,11 +488,11 @@ void testGetMultipleJobParameters() throws Exception {
jobexecution = jobRepository.createJobExecution(job.getName(), secondJobParameters);
job.execute(jobexecution);
- jobExecutionList = jobExplorer.getJobExecutions(jobexecution.getJobInstance());
+ jobExecutionList = jobRepository.getJobExecutions(jobexecution.getJobInstance());
- assertEquals(jobExecutionList.size(), 2);
- assertEquals(jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"), "second");
- assertEquals(jobExecutionList.get(1).getJobParameters().getString("JobExecutionParameter"), "first");
+ assertEquals(2, jobExecutionList.size());
+ assertEquals("second", jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"));
+ assertEquals("first", jobExecutionList.get(1).getJobParameters().getString("JobExecutionParameter"));
}
@@ -519,7 +502,7 @@ void testGetMultipleJobParameters() throws Exception {
private void checkRepository(BatchStatus status, ExitStatus exitStatus) {
assertEquals(jobInstance,
this.jobRepository.getLastJobExecution(job.getName(), jobParameters).getJobInstance());
- JobExecution jobExecution = this.jobExplorer.getJobExecutions(jobInstance).get(0);
+ JobExecution jobExecution = this.jobRepository.getJobExecutions(jobInstance).get(0);
assertEquals(jobInstance.getId(), jobExecution.getJobId());
assertEquals(status, jobExecution.getStatus());
if (exitStatus != null) {
@@ -570,11 +553,11 @@ public void execute(StepExecution stepExecution)
jobRepository.update(stepExecution);
jobRepository.updateExecutionContext(stepExecution);
- if (exception instanceof JobInterruptedException) {
+ if (exception instanceof JobInterruptedException jobInterruptedException) {
stepExecution.setExitStatus(ExitStatus.FAILED);
- stepExecution.setStatus(((JobInterruptedException) exception).getStatus());
+ stepExecution.setStatus(jobInterruptedException.getStatus());
stepExecution.addFailureException(exception);
- throw (JobInterruptedException) exception;
+ throw jobInterruptedException;
}
if (exception instanceof RuntimeException) {
stepExecution.setExitStatus(ExitStatus.FAILED);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java
index 3653b305cc..8e28b15caf 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java
@@ -23,12 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -53,7 +51,7 @@ void setUp() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
factory.afterPropertiesSet();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java
index dd47b49999..88834c2c62 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java
@@ -21,11 +21,10 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.job.SimpleStepHandler;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowExecution;
@@ -57,7 +56,7 @@ void testNext() throws Exception {
.start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution));
Iterator stepExecutions = execution.getStepExecutions().iterator();
- assertEquals(stepExecutions.next().getStepName(), "stepA");
+ assertEquals("stepA", stepExecutions.next().getStepName());
assertFalse(stepExecutions.hasNext());
}
@@ -74,9 +73,9 @@ void testMultipleNext() throws Exception {
.start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution));
Iterator stepExecutions = execution.getStepExecutions().iterator();
- assertEquals(stepExecutions.next().getStepName(), "stepA");
- assertEquals(stepExecutions.next().getStepName(), "stepB");
- assertEquals(stepExecutions.next().getStepName(), "stepC");
+ assertEquals("stepA", stepExecutions.next().getStepName());
+ assertEquals("stepB", stepExecutions.next().getStepName());
+ assertEquals("stepC", stepExecutions.next().getStepName());
assertFalse(stepExecutions.hasNext());
}
@@ -91,7 +90,7 @@ void testStart() throws Exception {
.start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution));
Iterator stepExecutions = execution.getStepExecutions().iterator();
- assertEquals(stepExecutions.next().getStepName(), "stepA");
+ assertEquals("stepA", stepExecutions.next().getStepName());
assertFalse(stepExecutions.hasNext());
}
@@ -106,7 +105,7 @@ void testFrom() throws Exception {
.start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution));
Iterator stepExecutions = execution.getStepExecutions().iterator();
- assertEquals(stepExecutions.next().getStepName(), "stepA");
+ assertEquals("stepA", stepExecutions.next().getStepName());
assertFalse(stepExecutions.hasNext());
}
@@ -118,23 +117,20 @@ void testTransitionOrdering() throws Exception {
StepSupport stepA = new StepSupport("stepA") {
@Override
- public void execute(StepExecution stepExecution)
- throws JobInterruptedException, UnexpectedJobExecutionException {
+ public void execute(StepExecution stepExecution) throws UnexpectedJobExecutionException {
stepExecution.setExitStatus(ExitStatus.FAILED);
}
};
StepSupport stepB = new StepSupport("stepB") {
@Override
- public void execute(StepExecution stepExecution)
- throws JobInterruptedException, UnexpectedJobExecutionException {
+ public void execute(StepExecution stepExecution) throws UnexpectedJobExecutionException {
}
};
StepSupport stepC = new StepSupport("stepC") {
@Override
- public void execute(StepExecution stepExecution)
- throws JobInterruptedException, UnexpectedJobExecutionException {
+ public void execute(StepExecution stepExecution) throws UnexpectedJobExecutionException {
}
};
@@ -148,16 +144,15 @@ public void execute(StepExecution stepExecution)
.start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution));
Iterator stepExecutions = execution.getStepExecutions().iterator();
- assertEquals(stepExecutions.next().getStepName(), "stepA");
- assertEquals(stepExecutions.next().getStepName(), "stepC");
+ assertEquals("stepA", stepExecutions.next().getStepName());
+ assertEquals("stepC", stepExecutions.next().getStepName());
assertFalse(stepExecutions.hasNext());
}
private static StepSupport createCompleteStep(String name) {
return new StepSupport(name) {
@Override
- public void execute(StepExecution stepExecution)
- throws JobInterruptedException, UnexpectedJobExecutionException {
+ public void execute(StepExecution stepExecution) throws UnexpectedJobExecutionException {
stepExecution.upgradeStatus(BatchStatus.COMPLETED);
stepExecution.setExitStatus(ExitStatus.COMPLETED);
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java
index 909c04c0d1..1e9e13abe1 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -28,23 +28,23 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.JobScope;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.batch.core.job.flow.support.SimpleFlow;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.item.support.ListItemReader;
@@ -119,7 +119,7 @@ void init() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
factory.afterPropertiesSet();
@@ -377,12 +377,12 @@ void testBuildWithStopAndRestart() throws Exception {
void testBuildWithJobScopedStep() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder().addLong("chunkSize", 2L).toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java
index 9678a8e4cc..f39dae8d02 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -20,14 +20,14 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.annotation.AfterJob;
import org.springframework.batch.core.annotation.BeforeJob;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.repeat.RepeatStatus;
@@ -50,11 +50,11 @@ class JobBuilderTests {
void testListeners() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(MyJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java
index 4d4b00fbd7..b1d52c16a9 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java
@@ -24,17 +24,17 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.job.flow.support.SimpleFlow;
import org.springframework.batch.core.job.flow.support.StateTransition;
import org.springframework.batch.core.job.flow.support.state.EndState;
import org.springframework.batch.core.job.flow.support.state.StepState;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -60,7 +60,7 @@ void init() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
factory.afterPropertiesSet();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java
index 349497096f..cbe37f0ad1 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,14 +19,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.support.DefaultStateTransitionComparator;
import org.springframework.batch.core.job.flow.support.SimpleFlow;
import org.springframework.batch.core.job.flow.support.StateTransition;
@@ -36,7 +34,7 @@
import org.springframework.batch.core.job.flow.support.state.SplitState;
import org.springframework.batch.core.job.flow.support.state.StepState;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -66,8 +64,6 @@ public class FlowJobTests {
private JobRepository jobRepository;
- private JobExplorer jobExplorer;
-
private boolean fail = false;
@BeforeEach
@@ -77,19 +73,13 @@ void setUp() throws Exception {
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase);
- JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean factory = new JdbcJobRepositoryFactoryBean();
factory.setDataSource(embeddedDatabase);
factory.setTransactionManager(transactionManager);
factory.afterPropertiesSet();
this.jobRepository = factory.getObject();
job.setJobRepository(this.jobRepository);
this.jobExecution = this.jobRepository.createJobExecution("job", new JobParameters());
-
- JobExplorerFactoryBean explorerFactoryBean = new JobExplorerFactoryBean();
- explorerFactoryBean.setDataSource(embeddedDatabase);
- explorerFactoryBean.setTransactionManager(transactionManager);
- explorerFactoryBean.afterPropertiesSet();
- this.jobExplorer = explorerFactoryBean.getObject();
}
@Test
@@ -714,7 +704,7 @@ private StepExecution getStepExecution(JobExecution jobExecution, String stepNam
private void checkRepository(BatchStatus status, ExitStatus exitStatus) {
JobInstance jobInstance = this.jobExecution.getJobInstance();
- JobExecution other = this.jobExplorer.getJobExecutions(jobInstance).get(0);
+ JobExecution other = this.jobRepository.getJobExecutions(jobInstance).get(0);
assertEquals(jobInstance.getId(), other.getJobId());
assertEquals(status, other.getStatus());
if (exitStatus != null) {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
index 005349f98f..2df18c06ba 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
@@ -26,16 +26,16 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.support.SimpleFlow;
import org.springframework.batch.core.job.flow.support.StateTransition;
import org.springframework.batch.core.job.flow.support.state.EndState;
import org.springframework.batch.core.job.flow.support.state.StepState;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -58,7 +58,7 @@ void setUp() throws Exception {
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
- JobRepositoryFactoryBean jobRepositoryFactoryBean = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean jobRepositoryFactoryBean = new JdbcJobRepositoryFactoryBean();
jobRepositoryFactoryBean.setDataSource(embeddedDatabase);
jobRepositoryFactoryBean.setTransactionManager(new JdbcTransactionManager(embeddedDatabase));
jobRepositoryFactoryBean.afterPropertiesSet();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java
index 2b1217657c..e5179e4c83 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.core.job.flow;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.job.flow.support.state.AbstractState;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java
index 8a61a173e0..2d0d955fbd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java
@@ -16,11 +16,11 @@
package org.springframework.batch.core.job.flow.support;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.StartLimitExceededException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.FlowExecutor;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
index ada6772359..10ab4d6c40 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
@@ -20,7 +20,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.support.JobFlowExecutorSupport;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java
index 2111ebc35a..9be2acf1b1 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2022 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -17,16 +17,14 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.Calendar;
-
import javax.sql.DataSource;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -66,7 +64,6 @@ private JobExecution launch(boolean start, long jobExecutionId) throws Exception
if (start) {
- Calendar c = Calendar.getInstance();
JobParametersBuilder builder = new JobParametersBuilder();
builder.addString("name", "foo");
JobParameters jobParameters = builder.toJobParameters();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java
index 2d8863826e..a0e96314ed 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java
@@ -25,15 +25,15 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.job.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobOperatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobOperatorTests.java
new file mode 100644
index 0000000000..e907773372
--- /dev/null
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobOperatorTests.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.launch.support;
+
+import java.util.Properties;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.converter.JobParametersConverter;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
+
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link CommandLineJobOperator}.
+ *
+ * @author Mahmoud Ben Hassine
+ */
+class CommandLineJobOperatorTests {
+
+ private final JobOperator jobOperator = mock();
+
+ private final JobRepository jobRepository = mock();
+
+ private final JobRegistry jobRegistry = mock();
+
+ private final JobParametersConverter jobParametersConverter = mock();
+
+ private final ExitCodeMapper exitCodeMapper = mock();
+
+ private CommandLineJobOperator commandLineJobOperator;
+
+ @BeforeEach
+ void setUp() {
+ commandLineJobOperator = new CommandLineJobOperator(jobOperator, jobRepository, jobRegistry);
+ commandLineJobOperator.setJobParametersConverter(jobParametersConverter);
+ commandLineJobOperator.setExitCodeMapper(exitCodeMapper);
+ }
+
+ @Test
+ void start() throws Exception {
+ // given
+ String jobName = "job";
+ Properties parameters = new Properties();
+ Job job = mock();
+ JobParameters jobParameters = mock();
+
+ // when
+ Mockito.when(jobRegistry.getJob(jobName)).thenReturn(job);
+ Mockito.when(jobParametersConverter.getJobParameters(parameters)).thenReturn(jobParameters);
+ this.commandLineJobOperator.start(jobName, parameters);
+
+ // then
+ Mockito.verify(jobRegistry).getJob(jobName);
+ Mockito.verify(jobParametersConverter).getJobParameters(parameters);
+ Mockito.verify(jobOperator).start(job, jobParameters);
+ }
+
+ @Test
+ void startNextInstance() throws Exception {
+ // given
+ String jobName = "job";
+ Job job = mock();
+
+ // when
+ Mockito.when(jobRegistry.getJob(jobName)).thenReturn(job);
+ this.commandLineJobOperator.startNextInstance(jobName);
+
+ // then
+ Mockito.verify(jobRegistry).getJob(jobName);
+ Mockito.verify(jobOperator).startNextInstance(job);
+ }
+
+ @Test
+ void stop() throws Exception {
+ // given
+ long jobExecutionId = 1;
+ JobExecution jobExecution = mock();
+
+ // when
+ Mockito.when(jobRepository.getJobExecution(jobExecutionId)).thenReturn(jobExecution);
+ this.commandLineJobOperator.stop(jobExecutionId);
+
+ // then
+ Mockito.verify(jobOperator).stop(jobExecution);
+ }
+
+ @Test
+ void restart() throws Exception {
+ // given
+ long jobExecutionId = 1;
+ JobExecution jobExecution = mock();
+
+ // when
+ Mockito.when(jobRepository.getJobExecution(jobExecutionId)).thenReturn(jobExecution);
+ this.commandLineJobOperator.restart(jobExecutionId);
+
+ // then
+ Mockito.verify(jobOperator).restart(jobExecution);
+ }
+
+ @Test
+ void abandon() throws Exception {
+ // given
+ long jobExecutionId = 1;
+ JobExecution jobExecution = mock();
+
+ // when
+ Mockito.when(jobRepository.getJobExecution(jobExecutionId)).thenReturn(jobExecution);
+ this.commandLineJobOperator.abandon(jobExecutionId);
+
+ // then
+ Mockito.verify(jobOperator).abandon(jobExecution);
+ }
+
+}
\ No newline at end of file
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
index 625145f0e2..d1eb434ba8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,19 +27,20 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.repository.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -58,6 +59,7 @@
* @author Mahmoud Ben Hassine
* @author Parikshit Dutta
*/
+@Disabled("Disabled until we replace the stub batch infrastructure with a JDBC one")
class CommandLineJobRunnerTests {
private String jobPath = ClassUtils.addResourcePathToPackagePath(CommandLineJobRunnerTests.class,
@@ -136,8 +138,8 @@ void testWrongJobName() throws Exception {
assertEquals(1, StubSystemExiter.status);
String errorMessage = CommandLineJobRunner.getErrorMessage();
assertTrue(
- (errorMessage.contains("No bean named 'no-such-job' is defined")
- || (errorMessage.contains("No bean named 'no-such-job' available"))),
+ errorMessage.contains("No bean named 'no-such-job' is defined")
+ || errorMessage.contains("No bean named 'no-such-job' available"),
"Wrong error message: " + errorMessage);
}
@@ -215,7 +217,7 @@ public int read() {
void testWithStdinParameters() throws Throwable {
String[] args = new String[] { jobPath, jobName };
System.setIn(new InputStream() {
- final char[] input = ("foo=bar\nspam=bucket").toCharArray();
+ final char[] input = "foo=bar\nspam=bucket".toCharArray();
int index = 0;
@@ -246,7 +248,7 @@ void testWithInvalidParameters() throws Throwable {
@Test
void testStop() throws Throwable {
String[] args = new String[] { jobPath, "-stop", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(3L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(3L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -254,7 +256,7 @@ void testStop() throws Throwable {
@Test
void testStopFailed() throws Throwable {
String[] args = new String[] { jobPath, "-stop", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(0L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(0L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -262,7 +264,7 @@ void testStopFailed() throws Throwable {
@Test
void testStopFailedAndRestarted() throws Throwable {
String[] args = new String[] { jobPath, "-stop", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(5L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(5L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -271,7 +273,7 @@ void testStopFailedAndRestarted() throws Throwable {
void testStopRestarted() throws Throwable {
String[] args = new String[] { jobPath, "-stop", jobName };
JobInstance jobInstance = new JobInstance(3L, jobName);
- StubJobExplorer.jobInstances = Arrays.asList(jobInstance);
+ StubJobExplorer.jobInstances = List.of(jobInstance);
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -279,7 +281,7 @@ void testStopRestarted() throws Throwable {
@Test
void testAbandon() throws Throwable {
String[] args = new String[] { jobPath, "-abandon", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(2L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(2L, jobName));
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
}
@@ -287,7 +289,7 @@ void testAbandon() throws Throwable {
@Test
void testAbandonRunning() throws Throwable {
String[] args = new String[] { jobPath, "-abandon", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(3L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(3L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -295,7 +297,7 @@ void testAbandonRunning() throws Throwable {
@Test
void testAbandonAbandoned() throws Throwable {
String[] args = new String[] { jobPath, "-abandon", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(4L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(4L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
}
@@ -305,7 +307,7 @@ void testRestart() throws Throwable {
String[] args = new String[] { jobPath, "-restart", jobName };
JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar").toJobParameters();
JobInstance jobInstance = new JobInstance(0L, jobName);
- StubJobExplorer.jobInstances = Arrays.asList(jobInstance);
+ StubJobExplorer.jobInstances = List.of(jobInstance);
StubJobExplorer.jobParameters = jobParameters;
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
@@ -340,7 +342,7 @@ void testRestartExecutionNotFailed() throws Throwable {
@Test
void testRestartNotFailed() throws Throwable {
String[] args = new String[] { jobPath, "-restart", jobName };
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(123L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(123L, jobName));
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
String errorMessage = CommandLineJobRunner.getErrorMessage();
@@ -351,13 +353,12 @@ void testRestartNotFailed() throws Throwable {
@Test
void testNext() throws Throwable {
String[] args = new String[] { jobPath, "-next", jobName, "bar=foo" };
- JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar")
- .addString("bar", "foo")
- .toJobParameters();
- StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(2L, jobName));
+ StubJobExplorer.jobInstances = List.of(new JobInstance(2L, jobName));
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
- jobParameters = new JobParametersBuilder().addString("foo", "spam").addString("bar", "foo").toJobParameters();
+ JobParameters jobParameters = new JobParametersBuilder().addString("foo", "spam")
+ .addString("bar", "foo")
+ .toJobParameters();
assertEquals(jobParameters, StubJobLauncher.jobParameters);
}
@@ -480,25 +481,25 @@ public JobExecution getJobExecution(@Nullable Long executionId) {
@Override
public List getJobExecutions(JobInstance jobInstance) {
if (jobInstance.getId() == 0) {
- return Arrays.asList(createJobExecution(jobInstance, BatchStatus.FAILED));
+ return List.of(createJobExecution(jobInstance, BatchStatus.FAILED));
}
if (jobInstance.getId() == 1) {
return null;
}
if (jobInstance.getId() == 2) {
- return Arrays.asList(createJobExecution(jobInstance, BatchStatus.STOPPED));
+ return List.of(createJobExecution(jobInstance, BatchStatus.STOPPED));
}
if (jobInstance.getId() == 3) {
- return Arrays.asList(createJobExecution(jobInstance, BatchStatus.STARTED));
+ return List.of(createJobExecution(jobInstance, BatchStatus.STARTED));
}
if (jobInstance.getId() == 4) {
- return Arrays.asList(createJobExecution(jobInstance, BatchStatus.ABANDONED));
+ return List.of(createJobExecution(jobInstance, BatchStatus.ABANDONED));
}
if (jobInstance.getId() == 5) {
return Arrays.asList(createJobExecution(jobInstance, BatchStatus.STARTED),
createJobExecution(jobInstance, BatchStatus.FAILED));
}
- return Arrays.asList(createJobExecution(jobInstance, BatchStatus.COMPLETED));
+ return List.of(createJobExecution(jobInstance, BatchStatus.COMPLETED));
}
private JobExecution createJobExecution(JobInstance jobInstance, BatchStatus status) {
@@ -556,6 +557,7 @@ public List getJobNames() {
throw new UnsupportedOperationException();
}
+ @SuppressWarnings("removal")
@Override
public List findJobInstancesByJobName(String jobName, int start, int count) {
throw new UnsupportedOperationException();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementerTests.java
index a56457d06f..65b3283f83 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementerTests.java
@@ -17,8 +17,8 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBeanTests.java
index c09cbe5925..2ef929624c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBeanTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -23,8 +23,6 @@
import org.springframework.aop.framework.Advised;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.test.util.AopTestUtils;
@@ -43,12 +41,8 @@ class JobOperatorFactoryBeanTests {
private final JobRepository jobRepository = Mockito.mock();
- private final JobLauncher jobLauncher = Mockito.mock();
-
private final JobRegistry jobRegistry = Mockito.mock();
- private final JobExplorer jobExplorer = Mockito.mock();
-
private final JobParametersConverter jobParametersConverter = Mockito.mock();
@Test
@@ -56,8 +50,6 @@ public void testJobOperatorCreation() throws Exception {
// given
JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
jobOperatorFactoryBean.setTransactionManager(this.transactionManager);
- jobOperatorFactoryBean.setJobLauncher(this.jobLauncher);
- jobOperatorFactoryBean.setJobExplorer(this.jobExplorer);
jobOperatorFactoryBean.setJobRegistry(this.jobRegistry);
jobOperatorFactoryBean.setJobRepository(this.jobRepository);
jobOperatorFactoryBean.setJobParametersConverter(this.jobParametersConverter);
@@ -69,7 +61,7 @@ public void testJobOperatorCreation() throws Exception {
// then
Assertions.assertNotNull(jobOperator);
Object targetObject = AopTestUtils.getTargetObject(jobOperator);
- Assertions.assertInstanceOf(SimpleJobOperator.class, targetObject);
+ Assertions.assertInstanceOf(TaskExecutorJobOperator.class, targetObject);
Assertions.assertEquals(this.transactionManager, getTransactionManagerSetOnJobOperator(jobOperator));
}
@@ -79,8 +71,6 @@ public void testCustomTransactionAttributesSource() throws Exception {
TransactionAttributeSource transactionAttributeSource = Mockito.mock();
JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
jobOperatorFactoryBean.setTransactionManager(this.transactionManager);
- jobOperatorFactoryBean.setJobLauncher(this.jobLauncher);
- jobOperatorFactoryBean.setJobExplorer(this.jobExplorer);
jobOperatorFactoryBean.setJobRegistry(this.jobRegistry);
jobOperatorFactoryBean.setJobRepository(this.jobRepository);
jobOperatorFactoryBean.setJobParametersConverter(this.jobParametersConverter);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/RunIdIncrementerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/RunIdIncrementerTests.java
index e14eb0b65e..6515b60ace 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/RunIdIncrementerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/RunIdIncrementerTests.java
@@ -19,8 +19,8 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
/**
* @author Dave Syer
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java
index aafbb361a7..e17793b35a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2012 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -15,11 +15,13 @@
*/
package org.springframework.batch.core.launch.support;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
+import org.springframework.batch.core.repository.JobRestartException;
/**
* Mock Job Launcher. Normally, something like EasyMock would be used to mock an
@@ -29,7 +31,7 @@
* @author Lucas Ward
*
*/
-public class StubJobLauncher implements JobLauncher {
+public class StubJobLauncher extends TaskExecutorJobOperator {
public static final int RUN_NO_ARGS = 0;
@@ -48,7 +50,8 @@ public boolean isRunning() {
}
@Override
- public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException {
+ public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException,
+ JobRestartException, JobInstanceAlreadyCompleteException, JobParametersInvalidException {
lastRunCalled = RUN_JOB_IDENTIFIER;
return returnValue;
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperatorTests.java
similarity index 78%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperatorTests.java
index d5d3951c2c..8a45fa8d66 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperatorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -28,19 +28,18 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.configuration.support.MapJobRegistry;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.JobInstanceAlreadyExistsException;
@@ -62,7 +61,6 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -73,14 +71,13 @@
* @author Jinwoo Bae
*
*/
-class SimpleJobOperatorTests {
+@SuppressWarnings("removal")
+class TaskExecutorJobOperatorTests {
- private SimpleJobOperator jobOperator;
+ private TaskExecutorJobOperator jobOperator;
protected Job job;
- private JobExplorer jobExplorer;
-
private JobRepository jobRepository;
private JobParameters jobParameters;
@@ -100,7 +97,12 @@ public JobParametersIncrementer getJobParametersIncrementer() {
}
};
- jobOperator = new SimpleJobOperator();
+ jobOperator = new TaskExecutorJobOperator() {
+ @Override
+ public JobExecution run(Job job, JobParameters jobParameters) {
+ return new JobExecution(new JobInstance(123L, job.getName()), 999L, jobParameters);
+ }
+ };
jobOperator.setJobRegistry(new MapJobRegistry() {
@Override
@@ -117,13 +119,6 @@ public Set getJobNames() {
}
});
- jobOperator.setJobLauncher(
- (job, jobParameters) -> new JobExecution(new JobInstance(123L, job.getName()), 999L, jobParameters));
-
- jobExplorer = mock();
-
- jobOperator.setJobExplorer(jobExplorer);
-
jobRepository = mock();
jobOperator.setJobRepository(jobRepository);
@@ -146,21 +141,21 @@ public Properties getProperties(@Nullable JobParameters params) {
@Test
void testMandatoryProperties() {
- jobOperator = new SimpleJobOperator();
+ jobOperator = new TaskExecutorJobOperator();
assertThrows(IllegalStateException.class, jobOperator::afterPropertiesSet);
}
/**
* Test method for
- * {@link org.springframework.batch.core.launch.support.SimpleJobOperator#startNextInstance(java.lang.String)}
+ * {@link org.springframework.batch.core.launch.support.TaskExecutorJobOperator#startNextInstance(java.lang.String)}
* .
*/
@Test
void testStartNextInstanceSunnyDay() throws Exception {
jobParameters = new JobParameters();
JobInstance jobInstance = new JobInstance(321L, "foo");
- when(jobExplorer.getJobInstances("foo", 0, 1)).thenReturn(Collections.singletonList(jobInstance));
- when(jobExplorer.getJobExecutions(jobInstance))
+ when(jobRepository.getJobInstances("foo", 0, 1)).thenReturn(Collections.singletonList(jobInstance));
+ when(jobRepository.getJobExecutions(jobInstance))
.thenReturn(Collections.singletonList(new JobExecution(jobInstance, new JobParameters())));
Long value = jobOperator.startNextInstance("foo");
assertEquals(999, value.longValue());
@@ -182,17 +177,23 @@ void testStartNewInstanceAlreadyExists() {
Properties properties = new Properties();
properties.setProperty("a", "b");
jobParameters = new JobParameters();
- when(jobRepository.isJobInstanceExists("foo", jobParameters)).thenReturn(true);
- jobRepository.isJobInstanceExists("foo", jobParameters);
+ JobInstance jobInstance = new JobInstance(123L, "foo");
+ when(jobRepository.getJobInstance("foo", jobParameters)).thenReturn(jobInstance);
assertThrows(JobInstanceAlreadyExistsException.class, () -> jobOperator.start("foo", properties));
}
+ @Test
+ void testStartWithIncrementer() throws Exception {
+ jobOperator.start(job, new JobParameters());
+ verify(jobRepository).getLastJobInstance("foo");
+ }
+
@Test
void testResumeSunnyDay() throws Exception {
jobParameters = new JobParameters();
- when(jobExplorer.getJobExecution(111L))
+ when(jobRepository.getJobExecution(111L))
.thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters));
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
Long value = jobOperator.restart(111L);
assertEquals(999, value.longValue());
}
@@ -201,8 +202,8 @@ void testResumeSunnyDay() throws Exception {
void testGetSummarySunnyDay() throws Exception {
jobParameters = new JobParameters();
JobExecution jobExecution = new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters);
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
- jobExplorer.getJobExecution(111L);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+ jobRepository.getJobExecution(111L);
String value = jobOperator.getSummary(111L);
assertEquals(jobExecution.toString(), value);
}
@@ -210,7 +211,7 @@ void testGetSummarySunnyDay() throws Exception {
@Test
void testGetSummaryNoSuchExecution() {
jobParameters = new JobParameters();
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
assertThrows(NoSuchJobExecutionException.class, () -> jobOperator.getSummary(111L));
}
@@ -222,7 +223,7 @@ void testGetStepExecutionSummariesSunnyDay() throws Exception {
jobExecution.createStepExecution("step1");
jobExecution.createStepExecution("step2");
jobExecution.getStepExecutions().iterator().next().setId(21L);
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
Map value = jobOperator.getStepExecutionSummaries(111L);
assertEquals(2, value.size());
}
@@ -230,7 +231,7 @@ void testGetStepExecutionSummariesSunnyDay() throws Exception {
@Test
void testGetStepExecutionSummariesNoSuchExecution() {
jobParameters = new JobParameters();
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
assertThrows(NoSuchJobExecutionException.class, () -> jobOperator.getStepExecutionSummaries(111L));
}
@@ -238,7 +239,7 @@ void testGetStepExecutionSummariesNoSuchExecution() {
void testFindRunningExecutionsSunnyDay() throws Exception {
jobParameters = new JobParameters();
JobExecution jobExecution = new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters);
- when(jobExplorer.findRunningJobExecutions("foo")).thenReturn(Collections.singleton(jobExecution));
+ when(jobRepository.findRunningJobExecutions("foo")).thenReturn(Collections.singleton(jobExecution));
Set value = jobOperator.getRunningExecutions("foo");
assertEquals(111L, value.iterator().next().longValue());
}
@@ -247,14 +248,14 @@ void testFindRunningExecutionsSunnyDay() throws Exception {
@SuppressWarnings("unchecked")
void testFindRunningExecutionsNoSuchJob() {
jobParameters = new JobParameters();
- when(jobExplorer.findRunningJobExecutions("no-such-job")).thenReturn(Collections.EMPTY_SET);
+ when(jobRepository.findRunningJobExecutions("no-such-job")).thenReturn(Collections.EMPTY_SET);
assertThrows(NoSuchJobException.class, () -> jobOperator.getRunningExecutions("no-such-job"));
}
@Test
void testGetJobParametersSunnyDay() throws Exception {
final JobParameters jobParameters = new JobParameters();
- when(jobExplorer.getJobExecution(111L))
+ when(jobRepository.getJobExecution(111L))
.thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters));
String value = jobOperator.getParameters(111L);
assertEquals("a=b", value);
@@ -262,7 +263,7 @@ void testGetJobParametersSunnyDay() throws Exception {
@Test
void testGetJobParametersNoSuchExecution() {
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
assertThrows(NoSuchJobExecutionException.class, () -> jobOperator.getParameters(111L));
}
@@ -270,8 +271,8 @@ void testGetJobParametersNoSuchExecution() {
void testGetLastInstancesSunnyDay() throws Exception {
jobParameters = new JobParameters();
JobInstance jobInstance = new JobInstance(123L, job.getName());
- when(jobExplorer.getJobInstances("foo", 0, 2)).thenReturn(Collections.singletonList(jobInstance));
- jobExplorer.getJobInstances("foo", 0, 2);
+ when(jobRepository.getJobInstances("foo", 0, 2)).thenReturn(Collections.singletonList(jobInstance));
+ jobRepository.getJobInstances("foo", 0, 2);
List value = jobOperator.getJobInstances("foo", 0, 2);
assertEquals(123L, value.get(0).longValue());
}
@@ -279,7 +280,7 @@ void testGetLastInstancesSunnyDay() throws Exception {
@Test
void testGetLastInstancesNoSuchJob() {
jobParameters = new JobParameters();
- jobExplorer.getJobInstances("no-such-job", 0, 2);
+ jobRepository.getJobInstances("no-such-job", 0, 2);
assertThrows(NoSuchJobException.class, () -> jobOperator.getJobInstances("no-such-job", 0, 2));
}
@@ -291,11 +292,11 @@ public void testGetJobInstanceWithNameAndParameters() {
JobInstance jobInstance = mock();
// when
- when(this.jobExplorer.getJobInstance(jobName, jobParameters)).thenReturn(jobInstance);
+ when(this.jobRepository.getJobInstance(jobName, jobParameters)).thenReturn(jobInstance);
JobInstance actualJobInstance = this.jobOperator.getJobInstance(jobName, jobParameters);
// then
- verify(this.jobExplorer).getJobInstance(jobName, jobParameters);
+ verify(this.jobRepository).getJobInstance(jobName, jobParameters);
assertEquals(jobInstance, actualJobInstance);
}
@@ -309,17 +310,17 @@ void testGetJobNames() {
@Test
void testGetExecutionsSunnyDay() throws Exception {
JobInstance jobInstance = new JobInstance(123L, job.getName());
- when(jobExplorer.getJobInstance(123L)).thenReturn(jobInstance);
+ when(jobRepository.getJobInstance(123L)).thenReturn(jobInstance);
JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
- when(jobExplorer.getJobExecutions(jobInstance)).thenReturn(Collections.singletonList(jobExecution));
+ when(jobRepository.getJobExecutions(jobInstance)).thenReturn(Collections.singletonList(jobExecution));
List value = jobOperator.getExecutions(123L);
assertEquals(111L, value.iterator().next().longValue());
}
@Test
void testGetExecutionsNoSuchInstance() {
- jobExplorer.getJobInstance(123L);
+ jobRepository.getJobInstance(123L);
assertThrows(NoSuchJobInstanceException.class, () -> jobOperator.getExecutions(123L));
}
@@ -327,8 +328,8 @@ void testGetExecutionsNoSuchInstance() {
void testStop() throws Exception {
JobInstance jobInstance = new JobInstance(123L, job.getName());
JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
- jobExplorer.getJobExecution(111L);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
+ jobRepository.getJobExecution(111L);
jobRepository.update(jobExecution);
jobOperator.stop(111L);
assertEquals(BatchStatus.STOPPING, jobExecution.getStatus());
@@ -345,15 +346,12 @@ void testStopTasklet() throws Exception {
job.taskletStep = taskletStep;
JobRegistry jobRegistry = mock();
- TaskletStep step = mock();
- when(step.getTasklet()).thenReturn(tasklet);
- when(step.getName()).thenReturn("test_job.step1");
when(jobRegistry.getJob(any(String.class))).thenReturn(job);
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
jobOperator.setJobRegistry(jobRegistry);
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
jobRepository.update(jobExecution);
jobOperator.stop(111L);
assertEquals(BatchStatus.STOPPING, jobExecution.getStatus());
@@ -363,18 +361,14 @@ void testStopTasklet() throws Exception {
void testStopTaskletWhenJobNotRegistered() throws Exception {
JobInstance jobInstance = new JobInstance(123L, job.getName());
JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
- StoppableTasklet tasklet = mock();
JobRegistry jobRegistry = mock();
- TaskletStep step = mock();
- when(step.getTasklet()).thenReturn(tasklet);
when(jobRegistry.getJob(job.getName())).thenThrow(new NoSuchJobException("Unable to find job"));
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
jobOperator.setJobRegistry(jobRegistry);
jobOperator.stop(111L);
assertEquals(BatchStatus.STOPPING, jobExecution.getStatus());
- verify(tasklet, never()).stop();
}
@Test
@@ -400,15 +394,12 @@ public void stop() {
job.taskletStep = taskletStep;
JobRegistry jobRegistry = mock();
- TaskletStep step = mock();
- when(step.getTasklet()).thenReturn(tasklet);
- when(step.getName()).thenReturn("test_job.step1");
when(jobRegistry.getJob(any(String.class))).thenReturn(job);
- when(jobExplorer.getJobExecution(111L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(111L)).thenReturn(jobExecution);
jobOperator.setJobRegistry(jobRegistry);
- jobExplorer.getJobExecution(111L);
+ jobRepository.getJobExecution(111L);
jobRepository.update(jobExecution);
jobOperator.stop(111L);
assertEquals(BatchStatus.STOPPING, jobExecution.getStatus());
@@ -419,7 +410,7 @@ void testAbort() throws Exception {
JobInstance jobInstance = new JobInstance(123L, job.getName());
JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
jobExecution.setStatus(BatchStatus.STOPPING);
- when(jobExplorer.getJobExecution(123L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(123L)).thenReturn(jobExecution);
jobRepository.update(jobExecution);
jobOperator.abandon(123L);
assertEquals(BatchStatus.ABANDONED, jobExecution.getStatus());
@@ -431,7 +422,7 @@ void testAbortNonStopping() {
JobInstance jobInstance = new JobInstance(123L, job.getName());
JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
jobExecution.setStatus(BatchStatus.STARTED);
- when(jobExplorer.getJobExecution(123L)).thenReturn(jobExecution);
+ when(jobRepository.getJobExecution(123L)).thenReturn(jobExecution);
jobRepository.update(jobExecution);
assertThrows(JobExecutionAlreadyRunningException.class, () -> jobOperator.abandon(123L));
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java
index 1ad3759d87..8119ae249f 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.core.launch.support;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
import org.springframework.lang.Nullable;
public class TestJobParametersIncrementer implements JobParametersIncrementer {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java
index 1ae514a1a1..6d3cda5dfd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,7 +19,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.ChunkListener;
+
import org.springframework.batch.core.scope.context.ChunkContext;
/**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java
index c9703acad0..6f86fc5d86 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,7 +21,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.ItemProcessListener;
/**
* @author Dave Syer
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java
index ac9bd41bac..f06a95f116 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -17,11 +17,10 @@
import static org.mockito.Mockito.mock;
-import java.util.ArrayList;
+import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.ItemReadListener;
/**
* @author Lucas Ward
@@ -67,11 +66,7 @@ void testOnReadError() {
@Test
void testSetListeners() {
- compositeListener.setListeners(new ArrayList<>() {
- {
- add(listener);
- }
- });
+ compositeListener.setListeners(List.of(listener));
listener.beforeRead();
compositeListener.beforeRead();
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
index 6531b4ef35..3740ecf94d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -15,12 +15,11 @@
*/
package org.springframework.batch.core.listener;
-import java.util.ArrayList;
+import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.ItemWriteListener;
import org.springframework.batch.item.Chunk;
import static org.mockito.Mockito.mock;
@@ -69,11 +68,7 @@ void testOnWriteError() {
@Test
void testSetListeners() {
- compositeListener.setListeners(new ArrayList<>() {
- {
- add(listener);
- }
- });
+ compositeListener.setListeners(List.of(listener));
Chunk
-
- org.neo4j
- neo4j-ogm-core
- ${neo4j-ogm-core.version}
- true
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jdk8
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
-
-
- org.springframework.kafkaspring-kafka
@@ -264,9 +248,9 @@
test
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
+ org.junit.platform
+ junit-platform-launcher
+ ${junit-platform-launcher.version}test
@@ -425,6 +409,12 @@
${sqlserver.version}test
+
+ org.testcontainers
+ kafka
+ ${testcontainers.version}
+ test
+ com.thoughtworks.xstreamxstream
@@ -553,6 +543,24 @@
${jruby.version}test
+
+ io.lettuce
+ lettuce-core
+ ${lettuce.version}
+ test
+
+
+ redis.clients
+ jedis
+ ${jedis.version}
+ test
+
+
+ com.redis
+ testcontainers-redis
+ ${testcontainers-redis.version}
+ test
+
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java
index 52895ca79d..46766a6321 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -26,7 +26,7 @@
/**
* Encapsulation of a list of items to be processed and possibly a list of failed items to
- * be skipped. To mark an item as skipped clients should iterate over the chunk using the
+ * be skipped. To mark an item as skipped, clients should iterate over the chunk using the
* {@link #iterator()} method, and if there is a failure call
* {@link Chunk.ChunkIterator#remove()} on the iterator. The skipped items are then
* available through the chunk.
@@ -130,7 +130,7 @@ public void skip(Exception e) {
}
/**
- * @return true if there are no items in the chunk
+ * @return {@code true} if there are no items in the chunk
*/
public boolean isEmpty() {
return items.isEmpty();
@@ -152,6 +152,14 @@ public int size() {
return items.size();
}
+ /**
+ * @return the number of skipped items
+ * @since 6.0.0
+ */
+ public int getSkipsSize() {
+ return skips.size();
+ }
+
/**
* Flag to indicate if the source data is exhausted.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
index c60d31ef34..4a0665ab12 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
@@ -29,9 +29,9 @@
import org.springframework.util.StringUtils;
/**
- * Superclass for delegating classes which dynamically call a custom method of injected
- * object. Provides convenient API for dynamic method invocation shielding subclasses from
- * low-level details and exception handling.
+ * Superclass for delegating classes which dynamically call a custom method of an injected
+ * object. Provides a convenient API for dynamic method invocation shielding subclasses
+ * from low-level details and exception handling.
*
* {@link Exception}s thrown by a successfully invoked delegate method are re-thrown
* without wrapping. In case the delegate method throws a {@link Throwable} that doesn't
@@ -164,7 +164,7 @@ private boolean targetClassDeclaresTargetMethod() {
if (arguments[j] == null) {
continue;
}
- if (!(ClassUtils.isAssignableValue(params[j], arguments[j]))) {
+ if (!ClassUtils.isAssignableValue(params[j], arguments[j])) {
argumentsMatchParameters = false;
}
}
@@ -205,7 +205,7 @@ public void setTargetMethod(String targetMethod) {
* will be supplied at runtime.
*/
public void setArguments(Object[] arguments) {
- this.arguments = arguments == null ? null : Arrays.asList(arguments).toArray();
+ this.arguments = arguments == null ? null : arguments.clone();
}
/**
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
index 75b35c7dab..545d44e888 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,8 +16,6 @@
package org.springframework.batch.item.adapter;
-import java.util.Arrays;
-
import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.ItemWriter;
import org.springframework.beans.BeanWrapper;
@@ -77,8 +75,7 @@ public void afterPropertiesSet() throws Exception {
* e.g. address.city
*/
public void setFieldsUsedAsTargetMethodArguments(String[] fieldsUsedAsMethodArguments) {
- this.fieldsUsedAsTargetMethodArguments = Arrays.asList(fieldsUsedAsMethodArguments)
- .toArray(new String[fieldsUsedAsMethodArguments.length]);
+ this.fieldsUsedAsTargetMethodArguments = fieldsUsedAsMethodArguments.clone();
}
}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
deleted file mode 100644
index 9c8ce109d6..0000000000
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright 2012-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.batch.item.data;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.bson.Document;
-import org.bson.codecs.DecoderContext;
-
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemReader;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
-import org.springframework.data.mongodb.util.json.ParameterBindingJsonReader;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- *
- * Restartable {@link ItemReader} that reads documents from MongoDB via a paging
- * technique.
- *
- *
- *
- * If you set JSON String query {@link #setQuery(String)} then it executes the JSON to
- * retrieve the requested documents.
- *
- *
- *
- * If you set Query object {@link #setQuery(Query)} then it executes the Query to retrieve
- * the requested documents.
- *
- *
- *
- * The query is executed using paged requests specified in the {@link #setPageSize(int)}.
- * Additional pages are requested as needed to provide data when the {@link #read()}
- * method is called.
- *
- *
- *
- * The JSON String query provided supports parameter substitution via ?<index>
- * placeholders where the <index> indicates the index of the parameterValue to
- * substitute.
- *
- *
- *
- * The implementation is thread-safe between calls to {@link #open(ExecutionContext)}, but
- * remember to use saveState=false if used in a multi-threaded client (no
- * restart available).
- *
- *
- * @author Michael Minella
- * @author Takaaki Iida
- * @author Mahmoud Ben Hassine
- * @author Parikshit Dutta
- * @deprecated Use {@link MongoPagingItemReader} instead. Scheduled for removal in v5.3 or
- * later.
- */
-@Deprecated(since = "5.1", forRemoval = true)
-public class MongoItemReader extends AbstractPaginatedDataItemReader implements InitializingBean {
-
- protected MongoOperations template;
-
- protected Query query;
-
- protected String queryString;
-
- protected Class type;
-
- protected Sort sort;
-
- protected String hint;
-
- protected String fields;
-
- protected String collection;
-
- protected List
+
+ org.junit.platform
+ junit-platform-launcher
+ ${junit-platform-launcher.version}
+ test
+ org.slf4jslf4j-simple
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/aot/IntegrationRuntimeHints.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/aot/IntegrationRuntimeHints.java
index 5f42caf800..a043f21a74 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/aot/IntegrationRuntimeHints.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/aot/IntegrationRuntimeHints.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -15,7 +15,6 @@
*/
package org.springframework.batch.integration.aot;
-import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.batch.integration.chunk.ChunkRequest;
@@ -28,6 +27,7 @@
* AOT hints for Spring Batch integration module.
*
* @author Mahmoud Ben Hassine
+ * @author Andrey Litvitski
* @since 5.0.1
*/
public class IntegrationRuntimeHints implements RuntimeHintsRegistrar {
@@ -35,11 +35,10 @@ public class IntegrationRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
// reflection hints
- MemberCategory[] memberCategories = MemberCategory.values();
- hints.reflection().registerType(ChunkRequest.class, memberCategories);
- hints.reflection().registerType(ChunkResponse.class, memberCategories);
- hints.reflection().registerType(StepExecutionRequestHandler.class, memberCategories);
- hints.reflection().registerType(MessageChannelPartitionHandler.class, memberCategories);
+ hints.reflection().registerType(ChunkRequest.class);
+ hints.reflection().registerType(ChunkResponse.class);
+ hints.reflection().registerType(StepExecutionRequestHandler.class);
+ hints.reflection().registerType(MessageChannelPartitionHandler.class);
// serialization hints
hints.serialization().registerType(ChunkRequest.class);
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java
index d6667974d7..286ede4ea8 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,8 @@
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.ItemProcessListener;
import org.springframework.batch.core.scope.context.StepContext;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.batch.item.ItemProcessor;
@@ -38,9 +39,7 @@
* lifecycle and stats limitations (since the framework doesn't know what the result of
* the processor is). While not an exhaustive list, things like
* {@link StepExecution#getFilterCount()} will not reflect the number of filtered items
- * and
- * {@link org.springframework.batch.core.ItemProcessListener#onProcessError(Object, Exception)}
- * will not be called.
+ * and {@link ItemProcessListener#onProcessError(Object, Exception)} will not be called.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java
index 58e9e9086a..b300409561 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java
@@ -75,10 +75,10 @@ public void write(Chunk> items) throws Exception {
catch (ExecutionException e) {
Throwable cause = e.getCause();
- if (cause instanceof Exception) {
+ if (cause instanceof Exception exception) {
logger.debug("An exception was thrown while processing an item", e);
- throw (Exception) cause;
+ throw exception;
}
else {
throw e;
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/StepExecutionInterceptor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/StepExecutionInterceptor.java
index c81f3bd1a9..3597a7182d 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/StepExecutionInterceptor.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/StepExecutionInterceptor.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.integration.async;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.StepContext;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.integration.support.MessageBuilder;
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
index 4475e2d1a6..1e6c15a7d0 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,9 +27,9 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemStream;
@@ -260,11 +260,11 @@ protected void getNextResult() throws AsynchronousFailureException {
* {@link AsynchronousFailureException}.
*/
protected static AsynchronousFailureException wrapIfNecessary(Throwable throwable) {
- if (throwable instanceof Error) {
- throw (Error) throwable;
+ if (throwable instanceof Error error) {
+ throw error;
}
- else if (throwable instanceof AsynchronousFailureException) {
- return (AsynchronousFailureException) throwable;
+ else if (throwable instanceof AsynchronousFailureException exception) {
+ return exception;
}
else {
return new AsynchronousFailureException("Exception in remote process", throwable);
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java
index 73d45fcb42..5c9bc9a9c5 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java
@@ -18,8 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.core.step.item.ChunkProcessor;
import org.springframework.batch.core.step.item.FaultTolerantChunkProcessor;
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
index 7abd58a359..3923787d99 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.item.Chunk;
/**
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
index 30965cb77e..088599d5d7 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.lang.Nullable;
/**
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
index 9def1ae7c3..25e3c9fd9b 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.core.step.item.ChunkOrientedTasklet;
import org.springframework.batch.core.step.item.ChunkProcessor;
@@ -122,12 +122,12 @@ public ChunkHandler getObject() throws Exception {
stepContributionSource = (StepContributionSource) chunkWriter;
}
- Assert.state(step instanceof TaskletStep, "Step [" + step.getName() + "] must be a TaskletStep");
+ Assert.state(step != null, "A TaskletStep must be provided");
if (logger.isDebugEnabled()) {
logger.debug("Converting TaskletStep with name=" + step.getName());
}
- Tasklet tasklet = getTasklet(step);
+ Tasklet tasklet = step.getTasklet();
Assert.state(tasklet instanceof ChunkOrientedTasklet,
"Tasklet must be ChunkOrientedTasklet in step=" + step.getName());
@@ -139,8 +139,8 @@ public ChunkHandler getObject() throws Exception {
+ "] because it already has a remote chunk writer. Use a local writer in the step.");
replaceChunkProcessor((ChunkOrientedTasklet) tasklet, chunkWriter, stepContributionSource);
- if (chunkWriter instanceof StepExecutionListener) {
- step.registerStepExecutionListener((StepExecutionListener) chunkWriter);
+ if (chunkWriter instanceof StepExecutionListener stepExecutionListener) {
+ step.registerStepExecutionListener(stepExecutionListener);
}
ChunkProcessorChunkHandler handler = new ChunkProcessorChunkHandler<>();
@@ -227,15 +227,6 @@ private ChunkProcessor getChunkProcessor(ChunkOrientedTasklet tasklet) {
return (ChunkProcessor) getField(tasklet, "chunkProcessor");
}
- /**
- * Pull a Tasklet out of a step.
- * @param step a TaskletStep
- * @return the Tasklet
- */
- private Tasklet getTasklet(TaskletStep step) {
- return (Tasklet) getField(step, "tasklet");
- }
-
private static Object getField(Object target, String name) {
Assert.notNull(target, "Target object must not be null");
Field field = ReflectionUtils.findField(target.getClass(), name);
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
index 4d033b61cf..83fc6c1efa 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 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.
@@ -15,11 +15,11 @@
*/
package org.springframework.batch.integration.chunk;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.ItemReadListener;
+import org.springframework.batch.core.listener.ItemWriteListener;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.FaultTolerantStepBuilder;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -82,17 +82,6 @@ public class RemoteChunkingManagerStepBuilder extends FaultTolerantStepBui
private long throttleLimit = DEFAULT_THROTTLE_LIMIT;
- /**
- * Create a new {@link RemoteChunkingManagerStepBuilder}.
- * @param stepName name of the manager step
- * @deprecated use
- * {@link RemoteChunkingManagerStepBuilder#RemoteChunkingManagerStepBuilder(String, JobRepository)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public RemoteChunkingManagerStepBuilder(String stepName) {
- super(new StepBuilder(stepName));
- }
-
/**
* Create a new {@link RemoteChunkingManagerStepBuilder}.
* @param stepName name of the manager step
@@ -228,21 +217,6 @@ public RemoteChunkingManagerStepBuilder reader(ItemReader rea
return this;
}
- /**
- * Set the job repository
- * @param jobRepository the repository to set
- * @return this to enable fluent chaining
- * @deprecated use
- * {@link RemoteChunkingManagerStepBuilder#RemoteChunkingManagerStepBuilder(String, JobRepository)}
- */
- @Override
- @SuppressWarnings("removal")
- @Deprecated(since = "5.1", forRemoval = true)
- public RemoteChunkingManagerStepBuilder repository(JobRepository jobRepository) {
- super.repository(jobRepository);
- return this;
- }
-
@Override
public RemoteChunkingManagerStepBuilder transactionManager(PlatformTransactionManager transactionManager) {
super.transactionManager(transactionManager);
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/StepContributionSource.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/StepContributionSource.java
index 50b599a936..227628c9ff 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/StepContributionSource.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/StepContributionSource.java
@@ -18,8 +18,8 @@
import java.util.Collection;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
/**
* A source of {@link StepContribution} instances that can be aggregated and used to
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/BatchIntegrationConfiguration.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/BatchIntegrationConfiguration.java
index eba18d0ed5..52ba5a4e61 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/BatchIntegrationConfiguration.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/BatchIntegrationConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -15,7 +15,6 @@
*/
package org.springframework.batch.integration.config.annotation;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.integration.chunk.RemoteChunkingManagerStepBuilderFactory;
import org.springframework.batch.integration.chunk.RemoteChunkingWorkerBuilder;
@@ -36,8 +35,6 @@
@Configuration(proxyBeanMethods = false)
public class BatchIntegrationConfiguration implements InitializingBean {
- private final JobExplorer jobExplorer;
-
private final JobRepository jobRepository;
private final PlatformTransactionManager transactionManager;
@@ -51,11 +48,8 @@ public class BatchIntegrationConfiguration implements InitializingBean {
private RemotePartitioningWorkerStepBuilderFactory remotePartitioningWorkerStepBuilderFactory;
@Autowired
- public BatchIntegrationConfiguration(JobRepository jobRepository, JobExplorer jobExplorer,
- PlatformTransactionManager transactionManager) {
-
+ public BatchIntegrationConfiguration(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
this.jobRepository = jobRepository;
- this.jobExplorer = jobExplorer;
this.transactionManager = transactionManager;
}
@@ -85,9 +79,9 @@ public void afterPropertiesSet() throws Exception {
this.transactionManager);
this.remoteChunkingWorkerBuilder = new RemoteChunkingWorkerBuilder<>();
this.remotePartitioningManagerStepBuilderFactory = new RemotePartitioningManagerStepBuilderFactory(
- this.jobRepository, this.jobExplorer);
+ this.jobRepository);
this.remotePartitioningWorkerStepBuilderFactory = new RemotePartitioningWorkerStepBuilderFactory(
- this.jobRepository, this.jobExplorer);
+ this.jobRepository);
}
}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java
index eddb35d1e7..b8fd1a77ec 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -17,7 +17,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.integration.launch.JobLaunchingGateway;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -28,10 +28,11 @@
/**
* The parser for the Job-Launching Gateway, which will instantiate a
- * {@link JobLaunchingGatewayParser}. If no {@link JobLauncher} reference has been
- * provided, this parse will use the use the globally registered bean 'jobLauncher'.
+ * {@link JobLaunchingGatewayParser}. If no {@link JobOperator} reference has been
+ * provided, this parse will use the globally registered bean 'jobOperator'.
*
* @author Gunnar Hillert
+ * @author Mahmoud Ben Hassine
* @since 1.3
*
*/
@@ -50,16 +51,16 @@ protected BeanDefinitionBuilder parseHandler(Element element, ParserContext pars
final BeanDefinitionBuilder jobLaunchingGatewayBuilder = BeanDefinitionBuilder
.genericBeanDefinition(JobLaunchingGateway.class);
- final String jobLauncher = element.getAttribute("job-launcher");
+ final String jobOperator = element.getAttribute("job-operator");
- if (StringUtils.hasText(jobLauncher)) {
- jobLaunchingGatewayBuilder.addConstructorArgReference(jobLauncher);
+ if (StringUtils.hasText(jobOperator)) {
+ jobLaunchingGatewayBuilder.addConstructorArgReference(jobOperator);
}
else {
if (logger.isDebugEnabled()) {
- logger.debug("No jobLauncher specified, using default 'jobLauncher' reference instead.");
+ logger.debug("No jobOperator specified, using default 'jobOperator' reference instead.");
}
- jobLaunchingGatewayBuilder.addConstructorArgReference("jobLauncher");
+ jobLaunchingGatewayBuilder.addConstructorArgReference("jobOperator");
}
IntegrationNamespaceUtils.setValueIfAttributeDefined(jobLaunchingGatewayBuilder, element, "reply-timeout",
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequest.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequest.java
index ceebf3428e..f2dd550cec 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequest.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequest.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.integration.launch;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
/**
* Encapsulation of a {@link Job} and its {@link JobParameters} forming a request for a
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequestHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequestHandler.java
index 7de15d337b..97d472f805 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequestHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchRequestHandler.java
@@ -16,8 +16,8 @@
package org.springframework.batch.integration.launch;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
/**
* Interface for handling a {@link JobLaunchRequest} and returning a {@link JobExecution}.
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingGateway.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingGateway.java
index a16365cc0a..380f1fdce1 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingGateway.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingGateway.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -16,9 +16,9 @@
package org.springframework.batch.integration.launch;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
@@ -29,6 +29,7 @@
* to a {@link JobLaunchingMessageHandler}.
*
* @author Gunnar Hillert
+ * @author Mahmoud Ben Hassine
* @since 1.3
*/
public class JobLaunchingGateway extends AbstractReplyProducingMessageHandler {
@@ -36,13 +37,13 @@ public class JobLaunchingGateway extends AbstractReplyProducingMessageHandler {
private final JobLaunchingMessageHandler jobLaunchingMessageHandler;
/**
- * Constructor taking a {@link JobLauncher} as parameter.
- * @param jobLauncher Must not be null.
+ * Constructor taking a {@link JobOperator} as parameter.
+ * @param jobOperator Must not be null.
*
*/
- public JobLaunchingGateway(JobLauncher jobLauncher) {
- Assert.notNull(jobLauncher, "jobLauncher must not be null.");
- this.jobLaunchingMessageHandler = new JobLaunchingMessageHandler(jobLauncher);
+ public JobLaunchingGateway(JobOperator jobOperator) {
+ Assert.notNull(jobOperator, "jobLauncher must not be null.");
+ this.jobLaunchingMessageHandler = new JobLaunchingMessageHandler(jobOperator);
}
/**
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
index a0bba11174..1ba1dd321e 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,11 +16,11 @@
package org.springframework.batch.integration.launch;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.integration.annotation.ServiceActivator;
/**
@@ -30,19 +30,20 @@
* @author Jonas Partner
* @author Dave Syer
* @author Gunnar Hillert
+ * @author Mahmoud Ben Hassine
*
*/
public class JobLaunchingMessageHandler implements JobLaunchRequestHandler {
- private final JobLauncher jobLauncher;
+ private final JobOperator jobOperator;
/**
- * @param jobLauncher {@link org.springframework.batch.core.launch.JobLauncher} used
+ * @param jobOperator {@link org.springframework.batch.core.launch.JobOperator} used
* to execute Spring Batch jobs
*/
- public JobLaunchingMessageHandler(JobLauncher jobLauncher) {
+ public JobLaunchingMessageHandler(JobOperator jobOperator) {
super();
- this.jobLauncher = jobLauncher;
+ this.jobOperator = jobOperator;
}
@Override
@@ -51,7 +52,7 @@ public JobExecution launch(JobLaunchRequest request) throws JobExecutionExceptio
Job job = request.getJob();
JobParameters jobParameters = request.getJobParameters();
- return jobLauncher.run(job, jobParameters);
+ return jobOperator.start(job, jobParameters);
}
}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/BeanFactoryStepLocator.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/BeanFactoryStepLocator.java
index 4e0aee6ea3..3678d18e0d 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/BeanFactoryStepLocator.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/BeanFactoryStepLocator.java
@@ -18,7 +18,7 @@
import java.util.Arrays;
import java.util.Collection;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java
index f0c710c544..05ae32d719 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2024 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -23,16 +23,12 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import javax.sql.DataSource;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.partition.StepExecutionSplitter;
import org.springframework.batch.core.partition.support.AbstractPartitionHandler;
@@ -96,14 +92,12 @@ public class MessageChannelPartitionHandler extends AbstractPartitionHandler imp
private long pollInterval = 10000;
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
- private boolean pollRepositoryForResults = false;
+ private boolean pollRepositoryForResults;
private long timeout = -1;
- private DataSource dataSource;
-
/**
* pollable channel for the replies
*/
@@ -114,23 +108,19 @@ public void afterPropertiesSet() throws Exception {
Assert.state(stepName != null, "A step name must be provided for the remote workers.");
Assert.state(messagingGateway != null, "The MessagingOperations must be set");
- pollRepositoryForResults = !(dataSource == null && jobExplorer == null);
+ pollRepositoryForResults = jobRepository != null;
if (pollRepositoryForResults) {
logger.debug("MessageChannelPartitionHandler is configured to poll the job repository for worker results");
}
-
- if (dataSource != null && jobExplorer == null) {
- JobExplorerFactoryBean jobExplorerFactoryBean = new JobExplorerFactoryBean();
- jobExplorerFactoryBean.setDataSource(dataSource);
- jobExplorerFactoryBean.afterPropertiesSet();
- jobExplorer = jobExplorerFactoryBean.getObject();
+ else {
+ logger.debug("MessageChannelPartitionHandler is configured to use a reply channel for worker results");
+ if (replyChannel == null) {
+ logger.info("No reply channel configured, using a QueueChannel as the default reply channel.");
+ replyChannel = new QueueChannel();
+ }
}
- if (!pollRepositoryForResults && replyChannel == null) {
- replyChannel = new QueueChannel();
- } // end if
-
}
/**
@@ -142,14 +132,12 @@ public void setTimeout(long timeout) {
}
/**
- * {@link org.springframework.batch.core.explore.JobExplorer} to use to query the job
- * repository. Either this or a {@link javax.sql.DataSource} is required when using
- * job repository polling.
- * @param jobExplorer {@link org.springframework.batch.core.explore.JobExplorer} to
- * use for lookups
+ * {@link JobRepository} to use to query the job repository. This is required when
+ * using job repository polling.
+ * @param jobRepository {@link JobRepository} to use for lookups
*/
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
+ public void setJobRepository(JobRepository jobRepository) {
+ this.jobRepository = jobRepository;
}
/**
@@ -160,15 +148,6 @@ public void setPollInterval(long pollInterval) {
this.pollInterval = pollInterval;
}
- /**
- * {@link javax.sql.DataSource} pointing to the job repository
- * @param dataSource {@link javax.sql.DataSource} that points to the job repository's
- * store
- */
- public void setDataSource(DataSource dataSource) {
- this.dataSource = dataSource;
- }
-
/**
* A pre-configured gateway for sending and receiving messages to the remote workers.
* Using this property allows a large degree of control over the timeouts and other
@@ -254,7 +233,7 @@ private Set pollReplies(final StepExecution managerStepExecution,
Set partitionStepExecutionIds = split.stream().map(StepExecution::getId).collect(Collectors.toSet());
Callable> callback = () -> {
- JobExecution jobExecution = jobExplorer.getJobExecution(managerStepExecution.getJobExecutionId());
+ JobExecution jobExecution = jobRepository.getJobExecution(managerStepExecution.getJobExecutionId());
Set finishedStepExecutions = jobExecution.getStepExecutions()
.stream()
.filter(stepExecution -> partitionStepExecutionIds.contains(stepExecution.getId()))
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
index 9759b4bc13..f1faa7b908 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 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.
@@ -16,13 +16,12 @@
package org.springframework.batch.integration.partition;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.partition.PartitionHandler;
import org.springframework.batch.core.partition.StepExecutionSplitter;
-import org.springframework.batch.core.partition.support.Partitioner;
-import org.springframework.batch.core.partition.support.StepExecutionAggregator;
+import org.springframework.batch.core.partition.Partitioner;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.PartitionStepBuilder;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -70,25 +69,12 @@ public class RemotePartitioningManagerStepBuilder extends PartitionStepBuilder {
private MessageChannel outputChannel;
- private JobExplorer jobExplorer;
-
private BeanFactory beanFactory;
private long pollInterval = DEFAULT_POLL_INTERVAL;
private long timeout = DEFAULT_TIMEOUT;
- /**
- * Create a new {@link RemotePartitioningManagerStepBuilder}.
- * @param stepName name of the manager step
- * @deprecated use
- * {@link RemotePartitioningManagerStepBuilder#RemotePartitioningManagerStepBuilder(String, JobRepository)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public RemotePartitioningManagerStepBuilder(String stepName) {
- super(new StepBuilder(stepName));
- }
-
/**
* Create a new {@link RemotePartitioningManagerStepBuilder}.
* @param stepName name of the manager step
@@ -148,17 +134,6 @@ public RemotePartitioningManagerStepBuilder messagingTemplate(MessagingTemplate
return this;
}
- /**
- * Set the job explorer.
- * @param jobExplorer the job explorer to use.
- * @return this builder instance for fluent chaining
- */
- public RemotePartitioningManagerStepBuilder jobExplorer(JobExplorer jobExplorer) {
- Assert.notNull(jobExplorer, "jobExplorer must not be null");
- this.jobExplorer = jobExplorer;
- return this;
- }
-
/**
* How often to poll the job repository for the status of the workers. Defaults to 10
* seconds.
@@ -213,19 +188,21 @@ public Step build() {
partitionHandler.setMessagingOperations(this.messagingTemplate);
if (isPolling()) {
- partitionHandler.setJobExplorer(this.jobExplorer);
+ partitionHandler.setJobRepository(getJobRepository());
partitionHandler.setPollInterval(this.pollInterval);
partitionHandler.setTimeout(this.timeout);
}
else {
PollableChannel replies = new QueueChannel();
partitionHandler.setReplyChannel(replies);
- StandardIntegrationFlow standardIntegrationFlow = IntegrationFlow.from(this.inputChannel)
- .aggregate(aggregatorSpec -> aggregatorSpec.processor(partitionHandler))
- .channel(replies)
- .get();
- IntegrationFlowContext integrationFlowContext = this.beanFactory.getBean(IntegrationFlowContext.class);
- integrationFlowContext.registration(standardIntegrationFlow).autoStartup(false).register();
+ if (this.beanFactory != null) {
+ StandardIntegrationFlow standardIntegrationFlow = IntegrationFlow.from(this.inputChannel)
+ .aggregate(aggregatorSpec -> aggregatorSpec.processor(partitionHandler))
+ .channel(replies)
+ .get();
+ IntegrationFlowContext integrationFlowContext = this.beanFactory.getBean(IntegrationFlowContext.class);
+ integrationFlowContext.registration(standardIntegrationFlow).autoStartup(false).register();
+ }
}
try {
@@ -243,21 +220,6 @@ private boolean isPolling() {
return this.inputChannel == null;
}
- /**
- * Set the job repository
- * @param jobRepository the repository to set
- * @return this to enable fluent chaining
- * @deprecated use
- * {@link RemotePartitioningManagerStepBuilder#RemotePartitioningManagerStepBuilder(String, JobRepository)}
- */
- @Override
- @SuppressWarnings("removal")
- @Deprecated(since = "5.1", forRemoval = true)
- public RemotePartitioningManagerStepBuilder repository(JobRepository jobRepository) {
- super.repository(jobRepository);
- return this;
- }
-
@Override
public RemotePartitioningManagerStepBuilder partitioner(String workerStepName, Partitioner partitioner) {
super.partitioner(workerStepName, partitioner);
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java
index 8a3c4995b0..0dcd701c65 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java
@@ -16,7 +16,6 @@
package org.springframework.batch.integration.partition;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -24,7 +23,7 @@
/**
* Convenient factory for a {@link RemotePartitioningManagerStepBuilder} which sets the
- * {@link JobRepository}, {@link JobExplorer} and {@link BeanFactory} automatically.
+ * {@link JobRepository} and {@link BeanFactory} automatically.
*
* @since 4.2
* @author Mahmoud Ben Hassine
@@ -33,19 +32,14 @@ public class RemotePartitioningManagerStepBuilderFactory implements BeanFactoryA
private BeanFactory beanFactory;
- final private JobExplorer jobExplorer;
-
final private JobRepository jobRepository;
/**
* Create a new {@link RemotePartitioningManagerStepBuilderFactory}.
* @param jobRepository the job repository to use
- * @param jobExplorer the job explorer to use
*/
- public RemotePartitioningManagerStepBuilderFactory(JobRepository jobRepository, JobExplorer jobExplorer) {
-
+ public RemotePartitioningManagerStepBuilderFactory(JobRepository jobRepository) {
this.jobRepository = jobRepository;
- this.jobExplorer = jobExplorer;
}
@Override
@@ -60,8 +54,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
* @return a {@link RemotePartitioningManagerStepBuilder}
*/
public RemotePartitioningManagerStepBuilder get(String name) {
- return new RemotePartitioningManagerStepBuilder(name, this.jobRepository).jobExplorer(this.jobExplorer)
- .beanFactory(this.beanFactory);
+ return new RemotePartitioningManagerStepBuilder(name, this.jobRepository).beanFactory(this.beanFactory);
}
}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
index 16fda82326..93d22e873a 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -19,12 +19,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecutionListener;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.job.flow.Flow;
-import org.springframework.batch.core.partition.support.Partitioner;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.batch.core.step.builder.FlowStepBuilder;
@@ -74,23 +73,10 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder {
private MessageChannel outputChannel;
- private JobExplorer jobExplorer;
-
private StepLocator stepLocator;
private BeanFactory beanFactory;
- /**
- * Initialize a step builder for a step with the given name.
- * @param name the name of the step
- * @deprecated use
- * {@link RemotePartitioningWorkerStepBuilder#RemotePartitioningWorkerStepBuilder(String, JobRepository)}
- */
- @Deprecated(since = "5.0", forRemoval = true)
- public RemotePartitioningWorkerStepBuilder(String name) {
- super(name);
- }
-
/**
* Initialize a step builder for a step with the given name.
* @param name the name of the step
@@ -124,17 +110,6 @@ public RemotePartitioningWorkerStepBuilder outputChannel(MessageChannel outputCh
return this;
}
- /**
- * Set the job explorer.
- * @param jobExplorer the job explorer to use
- * @return this builder instance for fluent chaining
- */
- public RemotePartitioningWorkerStepBuilder jobExplorer(JobExplorer jobExplorer) {
- Assert.notNull(jobExplorer, "jobExplorer must not be null");
- this.jobExplorer = jobExplorer;
- return this;
- }
-
/**
* Set the step locator used to locate the worker step to execute.
* @param stepLocator the step locator to use
@@ -157,21 +132,6 @@ public RemotePartitioningWorkerStepBuilder beanFactory(BeanFactory beanFactory)
return this;
}
- /**
- * Set the job repository
- * @param jobRepository the repository to set
- * @return this to enable fluent chaining
- * @deprecated use
- * {@link RemotePartitioningWorkerStepBuilder#RemotePartitioningWorkerStepBuilder(String, JobRepository)}
- */
- @Override
- @SuppressWarnings("removal")
- @Deprecated(since = "5.1", forRemoval = true)
- public RemotePartitioningWorkerStepBuilder repository(JobRepository jobRepository) {
- super.repository(jobRepository);
- return this;
- }
-
@Override
public RemotePartitioningWorkerStepBuilder startLimit(int startLimit) {
super.startLimit(startLimit);
@@ -196,39 +156,18 @@ public RemotePartitioningWorkerStepBuilder allowStartIfComplete(boolean allowSta
return this;
}
- @Deprecated(since = "5.0", forRemoval = true)
- @Override
- public TaskletStepBuilder tasklet(Tasklet tasklet) {
- configureWorkerIntegrationFlow();
- return super.tasklet(tasklet);
- }
-
@Override
public TaskletStepBuilder tasklet(Tasklet tasklet, PlatformTransactionManager transactionManager) {
configureWorkerIntegrationFlow();
return super.tasklet(tasklet, transactionManager);
}
- @Deprecated(since = "5.0", forRemoval = true)
- @Override
- public SimpleStepBuilder chunk(int chunkSize) {
- configureWorkerIntegrationFlow();
- return super.chunk(chunkSize);
- }
-
@Override
public SimpleStepBuilder chunk(int chunkSize, PlatformTransactionManager transactionManager) {
configureWorkerIntegrationFlow();
return super.chunk(chunkSize, transactionManager);
}
- @Deprecated(since = "5.0", forRemoval = true)
- @Override
- public SimpleStepBuilder chunk(CompletionPolicy completionPolicy) {
- configureWorkerIntegrationFlow();
- return super.chunk(completionPolicy);
- }
-
@Override
public SimpleStepBuilder chunk(CompletionPolicy completionPolicy,
PlatformTransactionManager transactionManager) {
@@ -267,7 +206,6 @@ public FlowStepBuilder flow(Flow flow) {
*/
private void configureWorkerIntegrationFlow() {
Assert.notNull(this.inputChannel, "An InputChannel must be provided");
- Assert.notNull(this.jobExplorer, "A JobExplorer must be provided");
if (this.stepLocator == null) {
BeanFactoryStepLocator beanFactoryStepLocator = new BeanFactoryStepLocator();
@@ -283,7 +221,7 @@ private void configureWorkerIntegrationFlow() {
}
StepExecutionRequestHandler stepExecutionRequestHandler = new StepExecutionRequestHandler();
- stepExecutionRequestHandler.setJobExplorer(this.jobExplorer);
+ stepExecutionRequestHandler.setJobRepository(getJobRepository());
stepExecutionRequestHandler.setStepLocator(this.stepLocator);
StandardIntegrationFlow standardIntegrationFlow = IntegrationFlow.from(this.inputChannel)
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java
index 7246b0d259..f204cd2bb1 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java
@@ -16,7 +16,6 @@
package org.springframework.batch.integration.partition;
-import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -24,7 +23,7 @@
/**
* Convenient factory for a {@link RemotePartitioningWorkerStepBuilder} which sets the
- * {@link JobRepository}, {@link JobExplorer} and {@link BeanFactory} automatically.
+ * {@link JobRepository} and {@link BeanFactory} automatically.
*
* @since 4.1
* @author Mahmoud Ben Hassine
@@ -33,18 +32,13 @@ public class RemotePartitioningWorkerStepBuilderFactory implements BeanFactoryAw
private BeanFactory beanFactory;
- final private JobExplorer jobExplorer;
-
final private JobRepository jobRepository;
/**
* Create a new {@link RemotePartitioningWorkerStepBuilderFactory}.
* @param jobRepository the job repository to use
- * @param jobExplorer the job explorer to use
*/
- public RemotePartitioningWorkerStepBuilderFactory(JobRepository jobRepository, JobExplorer jobExplorer) {
-
- this.jobExplorer = jobExplorer;
+ public RemotePartitioningWorkerStepBuilderFactory(JobRepository jobRepository) {
this.jobRepository = jobRepository;
}
@@ -60,8 +54,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
* @return a {@link RemotePartitioningWorkerStepBuilder}
*/
public RemotePartitioningWorkerStepBuilder get(String name) {
- return new RemotePartitioningWorkerStepBuilder(name, this.jobRepository).jobExplorer(this.jobExplorer)
- .beanFactory(this.beanFactory);
+ return new RemotePartitioningWorkerStepBuilder(name, this.jobRepository).beanFactory(this.beanFactory);
}
}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/StepExecutionRequestHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/StepExecutionRequestHandler.java
index bebf4f9d3f..b4fc1a322e 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/StepExecutionRequestHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/StepExecutionRequestHandler.java
@@ -1,10 +1,10 @@
package org.springframework.batch.integration.partition;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.step.NoSuchStepException;
import org.springframework.batch.core.step.StepLocator;
import org.springframework.integration.annotation.MessageEndpoint;
@@ -21,7 +21,7 @@
@MessageEndpoint
public class StepExecutionRequestHandler {
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
private StepLocator stepLocator;
@@ -34,12 +34,12 @@ public void setStepLocator(StepLocator stepLocator) {
}
/**
- * An explorer that should be used to check for {@link StepExecution} completion.
- * @param jobExplorer a {@link JobExplorer} that is linked to the shared repository
- * used by all remote workers.
+ * A job repository that should be used to check for {@link StepExecution} completion.
+ * @param jobRepository a {@link JobRepository} that is linked to the shared
+ * repository used by all remote workers.
*/
- public void setJobExplorer(JobExplorer jobExplorer) {
- this.jobExplorer = jobExplorer;
+ public void setJobRepository(JobRepository jobRepository) {
+ this.jobRepository = jobRepository;
}
@ServiceActivator
@@ -47,7 +47,7 @@ public StepExecution handle(StepExecutionRequest request) {
Long jobExecutionId = request.getJobExecutionId();
Long stepExecutionId = request.getStepExecutionId();
- StepExecution stepExecution = jobExplorer.getStepExecution(jobExecutionId, stepExecutionId);
+ StepExecution stepExecution = jobRepository.getStepExecution(jobExecutionId, stepExecutionId);
if (stepExecution == null) {
throw new NoSuchStepException("No StepExecution could be located for this request: " + request);
}
diff --git a/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration-3.1.xsd b/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration-3.1.xsd
index f1474b8a5e..e35e4b045a 100644
--- a/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration-3.1.xsd
+++ b/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration-3.1.xsd
@@ -162,7 +162,7 @@
]]>
-
+
diff --git a/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration.xsd b/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration.xsd
index 4444eeb068..39dd611098 100644
--- a/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration.xsd
+++ b/spring-batch-integration/src/main/resources/org/springframework/batch/integration/config/xml/spring-batch-integration.xsd
@@ -79,20 +79,20 @@
]]>
-
+
-
+
@@ -160,7 +160,7 @@
]]>
-
+
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
index 10c0688298..faea74454a 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
@@ -17,10 +17,10 @@
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
@@ -76,6 +76,7 @@ public void add(StepExecution stepExecution) {
public void update(StepExecution stepExecution) {
}
+ @SuppressWarnings("removal")
@Override
public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) {
return false;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
index 3deacda468..c3105f3126 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.integration;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
public class JobSupport implements Job {
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
index b196cde9e6..574ee7f565 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.integration;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
/**
* @author Dave Syer
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java
index 6e19aacfca..b103370933 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java
@@ -23,8 +23,8 @@
import java.util.concurrent.Future;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.test.MetaDataInstanceFactory;
import org.springframework.batch.test.StepScopeTestExecutionListener;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java
index 9cc6e88f38..44da36d49c 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.test.MetaDataInstanceFactory;
import org.springframework.batch.test.StepScopeTestExecutionListener;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
index b086386a77..fc1083f828 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
@@ -23,19 +23,19 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
import org.springframework.batch.core.step.factory.SimpleStepFactoryBean;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.ExecutionContext;
@@ -82,7 +82,7 @@ void setUp() throws Exception {
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase);
- JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean();
+ JdbcJobRepositoryFactoryBean repositoryFactoryBean = new JdbcJobRepositoryFactoryBean();
repositoryFactoryBean.setDataSource(embeddedDatabase);
repositoryFactoryBean.setTransactionManager(transactionManager);
repositoryFactoryBean.afterPropertiesSet();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
index 376894a490..3a9245ce4b 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
@@ -17,7 +17,7 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.test.MetaDataInstanceFactory;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests.java
index 088e3964b2..d18d507db2 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-2025 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.
@@ -22,13 +22,13 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
@@ -38,7 +38,7 @@
class RemoteChunkFaultTolerantStepIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@@ -56,7 +56,7 @@ void drain() {
@Test
void testFailedStep() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters(
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters(
Collections.singletonMap("item.three", new JobParameter<>("unsupported", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -67,7 +67,7 @@ void testFailedStep() throws Exception {
@Test
void testFailedStepOnError() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter<>("error", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -78,7 +78,7 @@ void testFailedStepOnError() throws Exception {
@Test
void testSunnyDayFaultTolerant() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter("3", Integer.class))));
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -88,7 +88,7 @@ void testSunnyDayFaultTolerant() throws Exception {
@Test
void testSkipsInWriter() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParametersBuilder().addString("item.three", "fail").addLong("run.id", 1L).toJobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests.java
index 6c30b38039..1488e40d12 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-2025 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.
@@ -23,13 +23,13 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
@@ -42,7 +42,7 @@
class RemoteChunkFaultTolerantStepJdbcIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@@ -61,7 +61,7 @@ void drain() {
@Test
@DirtiesContext
void testFailedStep() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters(
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters(
Collections.singletonMap("item.three", new JobParameter<>("unsupported", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -73,7 +73,7 @@ void testFailedStep() throws Exception {
@Test
@DirtiesContext
void testFailedStepOnError() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter<>("error", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -85,7 +85,7 @@ void testFailedStepOnError() throws Exception {
@Test
@DirtiesContext
void testSunnyDayFaultTolerant() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter("3", Integer.class))));
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -96,7 +96,7 @@ void testSunnyDayFaultTolerant() throws Exception {
@Test
@DirtiesContext
void testSkipsInWriter() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParametersBuilder().addString("item.three", "fail").addLong("run.id", 1L).toJobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java
index 9595f1e27d..e3e51d4985 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-2025 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.
@@ -23,13 +23,13 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -45,14 +45,14 @@ static void clear() {
}
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@Test
void testFailedStep() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters(
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters(
Collections.singletonMap("item.three", new JobParameter<>("unsupported", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -63,7 +63,7 @@ void testFailedStep() throws Exception {
@Test
void testFailedStepOnError() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter<>("error", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -74,7 +74,7 @@ void testFailedStepOnError() throws Exception {
@Test
void testSunnyDayFaultTolerant() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter("3", Integer.class))));
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -84,7 +84,7 @@ void testSunnyDayFaultTolerant() throws Exception {
@Test
void testSkipsInWriter() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParametersBuilder().addString("item.three", "fail").addLong("run.id", 1L).toJobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests.java
index 7b6198e0e5..198384dc62 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2023 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -21,12 +21,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -34,14 +34,14 @@
class RemoteChunkStepIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@Test
void testSunnyDaySimpleStep() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter("3", Integer.class))));
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
@@ -51,7 +51,7 @@ void testSunnyDaySimpleStep() throws Exception {
@Test
void testFailedStep() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParameters(Collections.singletonMap("item.three", new JobParameter<>("fail", String.class))));
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
StepExecution stepExecution = jobExecution.getStepExecutions().iterator().next();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java
index bb531b8f2c..6f50a4ea9f 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -23,14 +23,14 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemReadListener;
-import org.springframework.batch.core.ItemWriteListener;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.SkipListener;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.listener.ChunkListener;
+import org.springframework.batch.core.listener.ItemReadListener;
+import org.springframework.batch.core.listener.ItemWriteListener;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.listener.SkipListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.item.ChunkOrientedTasklet;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests.java
index 82090608b1..02ca238f97 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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. You may obtain a copy of the License at
@@ -13,9 +13,10 @@
package org.springframework.batch.integration.config.xml;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.integration.launch.JobLaunchingMessageHandler;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.ConfigurableApplicationContext;
@@ -80,10 +81,11 @@ void testJobLaunchingGatewayIsRunning() {
void testJobLaunchingGatewayNoJobLauncher() {
Exception exception = assertThrows(BeanCreationException.class,
() -> setUp("JobLaunchingGatewayParserTestsNoJobLauncher-context.xml", getClass()));
- assertEquals("No bean named 'jobLauncher' available", exception.getCause().getMessage());
+ assertEquals("No bean named 'jobOperator' available", exception.getCause().getMessage());
}
@Test
+ @Disabled("Seems like EnableBatchProcessing is not being picked up in this test")
void testJobLaunchingGatewayWithEnableBatchProcessing() {
setUp("JobLaunchingGatewayParserTestsWithEnableBatchProcessing-context.xml", getClass());
@@ -91,9 +93,9 @@ void testJobLaunchingGatewayWithEnableBatchProcessing() {
"handler.jobLaunchingMessageHandler", JobLaunchingMessageHandler.class);
assertNotNull(jobLaunchingMessageHandler);
- final JobLauncher jobLauncher = TestUtils.getPropertyValue(jobLaunchingMessageHandler, "jobLauncher",
- JobLauncher.class);
- assertNotNull(jobLauncher);
+ final JobOperator jobOperator = TestUtils.getPropertyValue(jobLaunchingMessageHandler, "jobOperator",
+ JobOperator.class);
+ assertNotNull(jobOperator);
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java
index 326c16ae7f..a5b92ea67b 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,10 +20,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.messaging.Message;
@@ -46,7 +46,7 @@ class FileToMessagesJobIntegrationTests implements MessageHandler {
private Job job;
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
int count = 0;
@@ -63,7 +63,7 @@ void setUp() {
@Test
void testFileSent() throws Exception {
- JobExecution execution = jobLauncher.run(job,
+ JobExecution execution = jobOperator.start(job,
new JobParametersBuilder().addLong("time.stamp", System.currentTimeMillis()).toJobParameters());
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
// 2 chunks sent to channel (5 items and commit-interval=3)
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java
index e3bbd18ced..49a044523f 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java
@@ -92,7 +92,7 @@ public String transform(String input) {
if (input.equals("filter")) {
return null;
}
- return input + ": " + (count++);
+ return input + ": " + count++;
}
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java
index d65fd5fa27..75f3a441fd 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests.java
@@ -18,10 +18,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.integration.JobSupport;
import org.springframework.batch.integration.step.TestTasklet;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java
index e9419e44c7..c627b92d5c 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -16,10 +16,10 @@
package org.springframework.batch.integration.launch;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.integration.JobSupport;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
@@ -33,6 +33,7 @@
/**
* @author Gunnar Hillert
+ * @author Mahmoud Ben Hassine
* @since 1.3
*
*/
@@ -45,11 +46,11 @@ void testExceptionRaised() throws Exception {
.withPayload(new JobLaunchRequest(new JobSupport("testJob"), new JobParameters()))
.build();
- final JobLauncher jobLauncher = mock();
- when(jobLauncher.run(any(Job.class), any(JobParameters.class)))
+ final JobOperator jobOperator = mock();
+ when(jobOperator.start(any(Job.class), any(JobParameters.class)))
.thenThrow(new JobParametersInvalidException("This is a JobExecutionException."));
- JobLaunchingGateway jobLaunchingGateway = new JobLaunchingGateway(jobLauncher);
+ JobLaunchingGateway jobLaunchingGateway = new JobLaunchingGateway(jobOperator);
Exception exception = assertThrows(MessageHandlingException.class,
() -> jobLaunchingGateway.handleMessage(message));
assertEquals("This is a JobExecutionException.", exception.getCause().getMessage());
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
index 052fb65b43..1fdf6633be 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
@@ -25,9 +25,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.integration.JobSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
index 06ec4b5bd5..dc5224653b 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -23,11 +23,11 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
import org.springframework.batch.integration.JobSupport;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -36,24 +36,24 @@ class JobLaunchingMessageHandlerTests {
JobLaunchRequestHandler messageHandler;
- StubJobLauncher jobLauncher;
+ StubJobOperator jobOperator;
@BeforeEach
void setUp() {
- jobLauncher = new StubJobLauncher();
- messageHandler = new JobLaunchingMessageHandler(jobLauncher);
+ jobOperator = new StubJobOperator();
+ messageHandler = new JobLaunchingMessageHandler(jobOperator);
}
@Test
void testSimpleDelivery() throws Exception {
messageHandler.launch(new JobLaunchRequest(new JobSupport("testjob"), null));
- assertEquals(1, jobLauncher.jobs.size(), "Wrong job count");
- assertEquals("testjob", jobLauncher.jobs.get(0).getName(), "Wrong job name");
+ assertEquals(1, jobOperator.jobs.size(), "Wrong job count");
+ assertEquals("testjob", jobOperator.jobs.get(0).getName(), "Wrong job name");
}
- private static class StubJobLauncher implements JobLauncher {
+ private static class StubJobOperator extends TaskExecutorJobOperator {
List jobs = new ArrayList<>();
@@ -62,7 +62,7 @@ private static class StubJobLauncher implements JobLauncher {
AtomicLong jobId = new AtomicLong();
@Override
- public JobExecution run(Job job, JobParameters jobParameters) {
+ public JobExecution start(Job job, JobParameters jobParameters) {
jobs.add(job);
parameters.add(jobParameters);
return new JobExecution(new JobInstance(jobId.getAndIncrement(), job.getName()), jobParameters);
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/BeanFactoryStepLocatorTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/BeanFactoryStepLocatorTests.java
index 2ca579be45..01cf6be584 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/BeanFactoryStepLocatorTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/BeanFactoryStepLocatorTests.java
@@ -19,9 +19,9 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
class BeanFactoryStepLocatorTests {
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java
index 14d72f8441..7b037fb0cc 100755
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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. You may obtain a copy of the License at
@@ -19,13 +19,13 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -45,27 +45,27 @@ class JmsIntegrationTests {
private final Log logger = LogFactory.getLog(getClass());
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@Autowired
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
@Test
void testSimpleProperties() {
- assertNotNull(jobLauncher);
+ assertNotNull(jobOperator);
}
@Test
void testLaunchJob() throws Exception {
- int before = jobExplorer.getJobInstances(job.getName(), 0, 100).size();
- assertNotNull(jobLauncher.run(job, new JobParameters()));
- List jobInstances = jobExplorer.getJobInstances(job.getName(), 0, 100);
+ int before = jobRepository.getJobInstances(job.getName(), 0, 100).size();
+ assertNotNull(jobOperator.start(job, new JobParameters()));
+ List jobInstances = jobRepository.getJobInstances(job.getName(), 0, 100);
int after = jobInstances.size();
assertEquals(1, after - before);
- JobExecution jobExecution = jobExplorer.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
+ JobExecution jobExecution = jobRepository.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus(),
jobExecution.getExitStatus().getExitDescription());
assertEquals(3, jobExecution.getStepExecutions().size());
@@ -73,7 +73,7 @@ void testLaunchJob() throws Exception {
// BATCH-1703: we are using a map dao so the step executions in the job
// execution are old and we need to
// pull them back out of the repository...
- stepExecution = jobExplorer.getStepExecution(jobExecution.getId(), stepExecution.getId());
+ stepExecution = jobRepository.getStepExecution(jobExecution.getId(), stepExecution.getId());
logger.debug(String.valueOf(stepExecution));
assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandlerTests.java
index 4f7b677649..35b46f6ae9 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.partition.StepExecutionSplitter;
import org.springframework.integration.MessageTimeoutException;
import org.springframework.integration.core.MessagingTemplate;
@@ -128,7 +128,6 @@ void testHandleWithReplyChannel() throws Exception {
}
- @SuppressWarnings("rawtypes")
@Test
void messageReceiveTimeout() throws Exception {
// execute with no default set
@@ -137,12 +136,10 @@ void messageReceiveTimeout() throws Exception {
StepExecution managerStepExecution = mock();
StepExecutionSplitter stepExecutionSplitter = mock();
MessagingTemplate operations = mock();
- Message message = mock();
// when
HashSet stepExecutions = new HashSet<>();
stepExecutions.add(new StepExecution("step1", new JobExecution(5L)));
when(stepExecutionSplitter.split(any(StepExecution.class), eq(1))).thenReturn(stepExecutions);
- when(message.getPayload()).thenReturn(Collections.emptyList());
// set
messageChannelPartitionHandler.setMessagingOperations(operations);
@@ -160,7 +157,7 @@ void testHandleWithJobRepositoryPolling() throws Exception {
StepExecution managerStepExecution = new StepExecution("step1", jobExecution, 1L);
StepExecutionSplitter stepExecutionSplitter = mock();
MessagingTemplate operations = mock();
- JobExplorer jobExplorer = mock();
+ JobRepository jobRepository = mock();
// when
HashSet stepExecutions = new HashSet<>();
StepExecution partition1 = new StepExecution("step1:partition1", jobExecution, 2L);
@@ -179,12 +176,12 @@ void testHandleWithJobRepositoryPolling() throws Exception {
runningJobExecution.addStepExecutions(Arrays.asList(partition2, partition1, partition3));
JobExecution completedJobExecution = new JobExecution(5L, new JobParameters());
completedJobExecution.addStepExecutions(Arrays.asList(partition2, partition1, partition4));
- when(jobExplorer.getJobExecution(5L)).thenReturn(runningJobExecution, runningJobExecution, runningJobExecution,
- completedJobExecution);
+ when(jobRepository.getJobExecution(5L)).thenReturn(runningJobExecution, runningJobExecution,
+ runningJobExecution, completedJobExecution);
// set
messageChannelPartitionHandler.setMessagingOperations(operations);
- messageChannelPartitionHandler.setJobExplorer(jobExplorer);
+ messageChannelPartitionHandler.setJobRepository(jobRepository);
messageChannelPartitionHandler.setStepName("step1");
messageChannelPartitionHandler.setPollInterval(500L);
messageChannelPartitionHandler.afterPropertiesSet();
@@ -212,7 +209,7 @@ void testHandleWithJobRepositoryPollingTimeout() throws Exception {
StepExecution managerStepExecution = new StepExecution("step1", jobExecution, 1L);
StepExecutionSplitter stepExecutionSplitter = mock();
MessagingTemplate operations = mock();
- JobExplorer jobExplorer = mock();
+ JobRepository jobRepository = mock();
// when
HashSet stepExecutions = new HashSet<>();
StepExecution partition1 = new StepExecution("step1:partition1", jobExecution, 2L);
@@ -227,11 +224,11 @@ void testHandleWithJobRepositoryPollingTimeout() throws Exception {
when(stepExecutionSplitter.split(any(StepExecution.class), eq(1))).thenReturn(stepExecutions);
JobExecution runningJobExecution = new JobExecution(5L, new JobParameters());
runningJobExecution.addStepExecutions(Arrays.asList(partition2, partition1, partition3));
- when(jobExplorer.getJobExecution(5L)).thenReturn(runningJobExecution);
+ when(jobRepository.getJobExecution(5L)).thenReturn(runningJobExecution);
// set
messageChannelPartitionHandler.setMessagingOperations(operations);
- messageChannelPartitionHandler.setJobExplorer(jobExplorer);
+ messageChannelPartitionHandler.setJobRepository(jobRepository);
messageChannelPartitionHandler.setStepName("step1");
messageChannelPartitionHandler.setTimeout(1000L);
messageChannelPartitionHandler.afterPropertiesSet();
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/PollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/PollingIntegrationTests.java
index 87c17934b8..a24960b4ca 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/PollingIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/PollingIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -40,27 +40,27 @@
class PollingIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@Autowired
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
@Test
void testSimpleProperties() {
- assertNotNull(jobLauncher);
+ assertNotNull(jobOperator);
}
@Test
void testLaunchJob() throws Exception {
- int before = jobExplorer.getJobInstances(job.getName(), 0, 100).size();
- assertNotNull(jobLauncher.run(job, new JobParameters()));
- List jobInstances = jobExplorer.getJobInstances(job.getName(), 0, 100);
+ int before = jobRepository.getJobInstances(job.getName(), 0, 100).size();
+ assertNotNull(jobOperator.start(job, new JobParameters()));
+ List jobInstances = jobRepository.getJobInstances(job.getName(), 0, 100);
int after = jobInstances.size();
assertEquals(1, after - before);
- JobExecution jobExecution = jobExplorer.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
+ JobExecution jobExecution = jobRepository.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(3, jobExecution.getStepExecutions().size());
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java
index 035bfedaad..3d7e682fb1 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -21,11 +21,11 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.partition.PartitionHandler;
-import org.springframework.batch.core.partition.support.Partitioner;
-import org.springframework.batch.core.partition.support.StepExecutionAggregator;
+import org.springframework.batch.core.partition.Partitioner;
+import org.springframework.batch.core.partition.StepExecutionAggregator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -38,10 +38,7 @@
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
import static org.springframework.test.util.ReflectionTestUtils.getField;
/**
@@ -95,20 +92,6 @@ void messagingTemplateMustNotBeNull() {
assertThat(expectedException).hasMessage("messagingTemplate must not be null");
}
- @Test
- void jobExplorerMustNotBeNull() {
- // given
- final RemotePartitioningManagerStepBuilder builder = new RemotePartitioningManagerStepBuilder("step",
- this.jobRepository);
-
- // when
- final Exception expectedException = assertThrows(IllegalArgumentException.class,
- () -> builder.jobExplorer(null));
-
- // then
- assertThat(expectedException).hasMessage("jobExplorer must not be null");
- }
-
@Test
void pollIntervalMustBeGreaterThanZero() {
// given
@@ -207,6 +190,7 @@ void testManagerStepCreationWhenAggregatingReplies() {
// given
int gridSize = 5;
int startLimit = 3;
+ DirectChannel inputChannel = new DirectChannel();
DirectChannel outputChannel = new DirectChannel();
Partitioner partitioner = Mockito.mock();
StepExecutionAggregator stepExecutionAggregator = (result, executions) -> {
@@ -214,6 +198,7 @@ void testManagerStepCreationWhenAggregatingReplies() {
// when
Step step = new RemotePartitioningManagerStepBuilder("managerStep", this.jobRepository)
+ .inputChannel(inputChannel)
.outputChannel(outputChannel)
.partitioner("workerStep", partitioner)
.gridSize(gridSize)
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java
index 87c4fbef1b..556b9aaf2f 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -21,7 +21,6 @@
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.Tasklet;
-import org.springframework.integration.channel.DirectChannel;
import org.springframework.transaction.PlatformTransactionManager;
import static org.assertj.core.api.Assertions.assertThat;
@@ -69,20 +68,6 @@ void outputChannelMustNotBeNull() {
assertThat(expectedException).hasMessage("outputChannel must not be null");
}
- @Test
- void jobExplorerMustNotBeNull() {
- // given
- final RemotePartitioningWorkerStepBuilder builder = new RemotePartitioningWorkerStepBuilder("step",
- this.jobRepository);
-
- // when
- final Exception expectedException = assertThrows(IllegalArgumentException.class,
- () -> builder.jobExplorer(null));
-
- // then
- assertThat(expectedException).hasMessage("jobExplorer must not be null");
- }
-
@Test
void stepLocatorMustNotBeNull() {
// given
@@ -125,20 +110,4 @@ void testMandatoryInputChannel() {
assertThat(expectedException).hasMessage("An InputChannel must be provided");
}
- @Test
- void testMandatoryJobExplorer() {
- // given
- DirectChannel inputChannel = new DirectChannel();
- final RemotePartitioningWorkerStepBuilder builder = new RemotePartitioningWorkerStepBuilder("step",
- this.jobRepository)
- .inputChannel(inputChannel);
-
- // when
- final Exception expectedException = assertThrows(IllegalArgumentException.class,
- () -> builder.tasklet(this.tasklet, this.transactionManager));
-
- // then
- assertThat(expectedException).hasMessage("A JobExplorer must be provided");
- }
-
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/VanillaIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/VanillaIntegrationTests.java
index 8a3601e2b4..4ddd61e4aa 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/VanillaIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/VanillaIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -22,12 +22,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -39,27 +39,27 @@
class VanillaIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private Job job;
@Autowired
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
@Test
void testSimpleProperties() {
- assertNotNull(jobLauncher);
+ assertNotNull(jobOperator);
}
@Test
void testLaunchJob() throws Exception {
- int before = jobExplorer.getJobInstances(job.getName(), 0, 100).size();
- assertNotNull(jobLauncher.run(job, new JobParameters()));
- List jobInstances = jobExplorer.getJobInstances(job.getName(), 0, 100);
+ int before = jobRepository.getJobInstances(job.getName(), 0, 100).size();
+ assertNotNull(jobOperator.start(job, new JobParameters()));
+ List jobInstances = jobRepository.getJobInstances(job.getName(), 0, 100);
int after = jobInstances.size();
assertEquals(1, after - before);
- JobExecution jobExecution = jobExplorer.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
+ JobExecution jobExecution = jobRepository.getJobExecutions(jobInstances.get(jobInstances.size() - 1)).get(0);
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(3, jobExecution.getStepExecutions().size());
}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/DelegateStep.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/DelegateStep.java
index 4338a9ba70..a73ac52da1 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/DelegateStep.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/DelegateStep.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.integration.step;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.util.Assert;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/StepGatewayIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/StepGatewayIntegrationTests.java
index 2ae737c4fd..2f9b8e76c1 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/StepGatewayIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/StepGatewayIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,11 +21,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -38,7 +38,7 @@
class StepGatewayIntegrationTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
@Qualifier("job")
@@ -54,7 +54,7 @@ void clear() {
@Test
void testLaunchJob() throws Exception {
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
}
@@ -62,7 +62,7 @@ void testLaunchJob() throws Exception {
@Test
void testLaunchFailedJob() throws Exception {
tasklet.setFail(true);
- JobExecution jobExecution = jobLauncher.run(job,
+ JobExecution jobExecution = jobOperator.start(job,
new JobParametersBuilder().addLong("run.id", 2L).toJobParameters());
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus());
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/TestTasklet.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/TestTasklet.java
index 59c42baa73..d2205ba65a 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/TestTasklet.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/step/TestTasklet.java
@@ -15,7 +15,7 @@
*/
package org.springframework.batch.integration.step;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml
index 9ff0d00b6d..9f40ab4b64 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml
@@ -75,8 +75,12 @@
-
+
+
+
+
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml
index 0895b1369c..61ce74d2ce 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml
@@ -109,8 +109,12 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml
index 9b6fb3d610..e2dc82f365 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml
@@ -62,13 +62,12 @@
-
-
-
-
+
-
+
+
\ No newline at end of file
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests-context.xml
index c389d4ce56..e0821915e4 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTests-context.xml
@@ -1,9 +1,10 @@
@@ -14,14 +15,18 @@
-
-
+
+
+
+
+
+ job-operator="jobOperator"/>
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTestsRunning-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTestsRunning-context.xml
index 44d4170f94..1ee7adf5e4 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTestsRunning-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParserTestsRunning-context.xml
@@ -14,14 +14,18 @@
-
-
+
+
+
+
+
+ job-operator="jobOperator"/>
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests-context.xml
index 5c33b1b4bf..c855b0c318 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingGatewayIntegrationTests-context.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
index 71ddfda8b4..cdb860f503 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/JmsIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/JmsIntegrationTests-context.xml
index e885b61b0a..af1323f7d6 100755
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/JmsIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/JmsIntegrationTests-context.xml
@@ -38,7 +38,7 @@
+ p:jobRepository-ref="jobRepository" p:stepLocator-ref="stepLocator" />
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/PollingIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/PollingIntegrationTests-context.xml
index e4ac226664..8e4bdf4ca1 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/PollingIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/PollingIntegrationTests-context.xml
@@ -19,7 +19,7 @@
+ p:jobRepository-ref="jobRepository" p:stepLocator-ref="stepLocator" />
@@ -29,7 +29,7 @@
-
+
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml
index dddc94ed1b..813802ac06 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml
@@ -27,7 +27,7 @@
+ p:jobRepository-ref="jobRepository" p:stepLocator-ref="stepLocator" />
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml
index c8a15e5c4f..dfe412971b 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml
@@ -23,8 +23,8 @@
-
+
diff --git a/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml b/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml
index 00b702423c..ca22226217 100644
--- a/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml
+++ b/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml
@@ -5,17 +5,15 @@
-
+
+
+
+
-
-
-
-
-
diff --git a/spring-batch-samples/README.md b/spring-batch-samples/README.md
index 770c7fd938..4b334cf8ee 100644
--- a/spring-batch-samples/README.md
+++ b/spring-batch-samples/README.md
@@ -603,7 +603,7 @@ class without any argument to start the sample.
### MongoDB sample
This sample is a showcase of MongoDB support in Spring Batch. It copies data from
-an input collection to an output collection using `MongoItemReader` and `MongoItemWriter`.
+an input collection to an output collection using `MongoPagingItemReader` and `MongoItemWriter`.
To run the sample, you need to have a MongoDB server up and running on `localhost:27017`
(you can change these defaults in `mongodb-sample.properties`). If you use docker,
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 646a150321..5196af1b54 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -4,7 +4,7 @@
org.springframework.batchspring-batch
- 5.2.2
+ 6.0.0-M1spring-batch-samplesjar
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java
index 3ed5730536..4e2238969e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java
@@ -17,9 +17,10 @@
package org.springframework.batch.samples.amqp;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
@@ -41,6 +42,7 @@
*/
@Configuration
@EnableBatchProcessing
+@EnableJdbcJobRepository
@Import(DataSourceConfiguration.class)
public class AmqpJobConfiguration {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java
index d4e53aa5df..e09bfe6dbe 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java
@@ -20,7 +20,7 @@
import jakarta.jms.JMSException;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.repository.JobRepository;
@@ -110,7 +110,7 @@ public ListItemReader itemReader() {
@Bean
public TaskletStep managerStep() {
return this.managerStepBuilderFactory.get("managerStep")
- .chunk(3)
+ .chunk(3)
.reader(itemReader())
.outputChannel(requests())
.inputChannel(replies())
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java
index 0707873df0..d6556e7986 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2014 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -20,7 +20,7 @@
import javax.sql.DataSource;
-import org.springframework.batch.core.partition.support.Partitioner;
+import org.springframework.batch.core.partition.Partitioner;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java
index ad36068a65..fc30224baa 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -18,9 +18,9 @@
import javax.sql.DataSource;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java
index 426434c923..ecd5ef260f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java
@@ -16,7 +16,7 @@
package org.springframework.batch.samples.common;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.item.ExecutionContext;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java
index f3d6c4b5d8..94ae806a19 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java
@@ -16,8 +16,8 @@
package org.springframework.batch.samples.common;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
import org.springframework.batch.core.job.flow.JobExecutionDecider;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java
index e13570d277..221f231758 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.annotation.AfterStep;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.annotation.OnSkipInProcess;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java
index 0967635495..9b64f77d71 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -29,8 +29,8 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ReaderNotOpenException;
import org.springframework.beans.factory.DisposableBean;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java
index b56454502f..6d9974dfe5 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,8 +21,8 @@
import java.util.ListIterator;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.ItemWriter;
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java
index 1c081de5fd..525cab87f4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -16,8 +16,8 @@
package org.springframework.batch.samples.domain.trade;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.listener.StepExecutionListener;
import org.springframework.batch.item.file.transform.FieldSet;
import org.springframework.batch.item.file.transform.LineTokenizer;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java
index 2812aced71..55a22d5785 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java
@@ -81,7 +81,7 @@ public CustomerCredit increaseCreditBy(BigDecimal sum) {
@Override
public boolean equals(Object o) {
- return (o instanceof CustomerCredit) && ((CustomerCredit) o).id == id;
+ return (o instanceof CustomerCredit customerCredit) && customerCredit.id == id;
}
@Override
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java
index 08bfef4387..d0c2f118d7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java
@@ -1,6 +1,6 @@
package org.springframework.batch.samples.file.delimited;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.job.builder.JobBuilder;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java
index 7ab07d32f3..19466c8e01 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java
@@ -1,6 +1,6 @@
package org.springframework.batch.samples.file.fixed;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.job.builder.JobBuilder;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java
index 1ead490d55..135a9ec821 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java
@@ -15,8 +15,8 @@
*/
package org.springframework.batch.samples.file.json;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.job.builder.JobBuilder;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java
index 78d40c8631..c8283b1be1 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java
@@ -1,6 +1,6 @@
package org.springframework.batch.samples.file.multiline;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.job.builder.JobBuilder;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java
index 7aaa8b68af..53aa2418e0 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java
@@ -32,11 +32,11 @@ public class DelegatingTradeLineAggregator implements LineAggregator
-
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml
index cdb0c5177e..c2b9af257c 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/adapter/readerwriter/delegatingJob.xml
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/batch https://www.springframework.org/schema/batch/spring-batch.xsd">
- The intent is to to give an example of how existing bean
+ The intent is to give an example of how existing bean
definitions (e.g. from custom application's domain layer) can be
integrated into a batch job.
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
index 52a8c890f0..f86890ec58 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
@@ -26,26 +26,26 @@ CREATE TABLE TRADE_SEQ (
);
INSERT INTO TRADE_SEQ (ID) values (0);
-CREATE TABLE BATCH_STAGING (
- ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+CREATE TABLE BATCH_STAGING (
+ ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
JOB_ID BIGINT NOT NULL,
VALUE LONGVARBINARY NOT NULL,
PROCESSED CHAR(1) NOT NULL
) ;
-CREATE TABLE TRADE (
- ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
+CREATE TABLE TRADE (
+ ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
ISIN VARCHAR(45) NOT NULL,
- QUANTITY BIGINT ,
- PRICE DECIMAL(8,2) ,
+ QUANTITY BIGINT,
+ PRICE DECIMAL(8,2),
CUSTOMER VARCHAR(45)
) ;
CREATE TABLE CUSTOMER (
- ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
- VERSION BIGINT ,
- NAME VARCHAR(45) ,
+ ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
+ VERSION BIGINT,
+ NAME VARCHAR(45),
CREDIT DECIMAL(10,2)
) ;
@@ -58,7 +58,7 @@ CREATE TABLE PLAYERS (
PLAYER_ID CHAR(8) NOT NULL PRIMARY KEY,
LAST_NAME VARCHAR(35) NOT NULL,
FIRST_NAME VARCHAR(25) NOT NULL,
- POS VARCHAR(10) ,
+ POS VARCHAR(10),
YEAR_OF_BIRTH BIGINT NOT NULL,
YEAR_DRAFTED BIGINT NOT NULL
) ;
@@ -68,37 +68,37 @@ CREATE TABLE GAMES (
YEAR_NO BIGINT NOT NULL,
TEAM CHAR(3) NOT NULL,
WEEK BIGINT NOT NULL,
- OPPONENT CHAR(3) ,
- COMPLETES BIGINT ,
- ATTEMPTS BIGINT ,
- PASSING_YARDS BIGINT ,
- PASSING_TD BIGINT ,
- INTERCEPTIONS BIGINT ,
- RUSHES BIGINT ,
- RUSH_YARDS BIGINT ,
- RECEPTIONS BIGINT ,
- RECEPTIONS_YARDS BIGINT ,
+ OPPONENT CHAR(3),
+ COMPLETES BIGINT,
+ ATTEMPTS BIGINT,
+ PASSING_YARDS BIGINT,
+ PASSING_TD BIGINT,
+ INTERCEPTIONS BIGINT,
+ RUSHES BIGINT,
+ RUSH_YARDS BIGINT,
+ RECEPTIONS BIGINT,
+ RECEPTIONS_YARDS BIGINT,
TOTAL_TD BIGINT
) ;
-CREATE TABLE PLAYER_SUMMARY (
+CREATE TABLE PLAYER_SUMMARY (
ID CHAR(8) NOT NULL,
YEAR_NO BIGINT NOT NULL,
- COMPLETES BIGINT NOT NULL ,
- ATTEMPTS BIGINT NOT NULL ,
- PASSING_YARDS BIGINT NOT NULL ,
- PASSING_TD BIGINT NOT NULL ,
- INTERCEPTIONS BIGINT NOT NULL ,
- RUSHES BIGINT NOT NULL ,
- RUSH_YARDS BIGINT NOT NULL ,
- RECEPTIONS BIGINT NOT NULL ,
- RECEPTIONS_YARDS BIGINT NOT NULL ,
+ COMPLETES BIGINT NOT NULL,
+ ATTEMPTS BIGINT NOT NULL,
+ PASSING_YARDS BIGINT NOT NULL,
+ PASSING_TD BIGINT NOT NULL,
+ INTERCEPTIONS BIGINT NOT NULL,
+ RUSHES BIGINT NOT NULL,
+ RUSH_YARDS BIGINT NOT NULL,
+ RECEPTIONS BIGINT NOT NULL,
+ RECEPTIONS_YARDS BIGINT NOT NULL,
TOTAL_TD BIGINT NOT NULL
) ;
-CREATE TABLE ERROR_LOG (
- JOB_NAME CHAR(20) ,
- STEP_NAME CHAR(20) ,
+CREATE TABLE ERROR_LOG (
+ JOB_NAME CHAR(20),
+ STEP_NAME CHAR(20),
MESSAGE VARCHAR(300) NOT NULL
) ;
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml
index 19565cf80e..0e87b7d115 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/jpa.xml
@@ -49,15 +49,18 @@
overwrite with ISOLATION_DEFAULT
-->
+ class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean">
-
+
+
+
+
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml
index d3e3698abc..ee5720533b 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/jpa/job/repository.xml
@@ -69,15 +69,18 @@
overwrite with ISOLATION_DEFAULT
-->
+ class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean">
-
+
+
+
+
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml
index efbc83b8d5..25046703c5 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/jmx/adhoc-job-launcher-context.xml
@@ -6,21 +6,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml
index 715a773e63..cfd657f588 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml
@@ -1,29 +1,42 @@
+ xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -31,7 +44,7 @@
-
+
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml
index 4b78507734..58a60aaaf8 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/skip/job/skipSample-job-launcher-context.xml
@@ -6,17 +6,13 @@
-
-
-
-
-
-
+
-
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index 7e66008208..bfec5974bc 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -6,32 +6,18 @@
-
-
-
-
-
-
-
-
+ class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean"
+ p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager"/>
-
-
-
+
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java
index 592a3dcbeb..606c779aac 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/readerwriter/DelegatingJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2023 the original author or authors.
+ * Copyright 2007-2025 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.
@@ -18,7 +18,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.samples.domain.person.PersonService;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -30,14 +30,14 @@
class DelegatingJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
private PersonService personService;
@Test
void testLaunchJob() throws Exception {
- jobLauncherTestUtils.launchJob();
+ jobOperatorTestUtils.startJob();
assertTrue(personService.getReturnedCount() > 0);
assertEquals(personService.getReturnedCount(), personService.getReceivedCount());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java
index c7916b0644..4f0a500477 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/adapter/tasklet/TaskletAdapterJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,9 +19,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -32,12 +32,12 @@
class TaskletAdapterJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJob() throws Exception {
- JobExecution jobExecution = jobLauncherTestUtils
- .launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
+ JobExecution jobExecution = jobOperatorTestUtils
+ .startJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals("yes", jobExecution.getExecutionContext().getString("done"));
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java
index c13603e20c..7b9e83ab3e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/amqp/AmqpJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -30,13 +30,13 @@
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -64,24 +64,24 @@
@Testcontainers(disabledWithoutDocker = true)
class AmqpJobFunctionalTests {
- private static final DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3");
+ private static final DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:4.1.2");
@Container
public static RabbitMQContainer rabbitmq = new RabbitMQContainer(RABBITMQ_IMAGE);
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
// given
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
// when
- int count = jobExplorer.getJobInstances("amqp-example-job", 0, 1).size();
+ int count = jobRepository.getJobInstances("amqp-example-job", 0, 1).size();
// then
assertTrue(count > 0);
@@ -92,15 +92,15 @@ public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(AmqpJobConfiguration.class,
AmqpConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- jobLauncher.run(job, new JobParameters());
+ jobOperator.start(job, new JobParameters());
// then
- JobExplorer localJobExplorer = context.getBean(JobExplorer.class);
- int count = localJobExplorer.getJobInstances("amqp-config-job", 0, 1).size();
+ JobRepository localJobRepository = context.getBean(JobRepository.class);
+ int count = localJobRepository.getJobInstances("amqp-config-job", 0, 1).size();
assertTrue(count > 0);
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java
index a2d0c4cdc6..dd205c6a15 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/beanwrapper/BeanWrapperMapperSampleJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,8 +19,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -31,12 +31,12 @@
class BeanWrapperMapperSampleJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testJobLaunch() throws Exception {
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob();
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java
index 07d5f93da5..d024317990 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/chunking/RemoteChunkingJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -23,10 +23,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.PropertySource;
@@ -48,7 +48,7 @@
class RemoteChunkingJobFunctionalTests {
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
private EmbeddedActiveMQ brokerService;
@@ -74,13 +74,12 @@ void tearDown() throws Exception {
@Test
void testRemoteChunkingJob(@Autowired Job job) throws Exception {
// when
- JobExecution jobExecution = this.jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = this.jobOperator.start(job, new JobParameters());
// then
+ // the manager sent 2 chunks ({1, 2, 3} and {4, 5, 6}) to workers
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
- assertEquals("Waited for 2 results.", // the manager sent 2 chunks ({1, 2,
- // 3} and {4, 5, 6}) to workers
- jobExecution.getExitStatus().getExitDescription());
+ assertEquals("Waited for 2 results.", jobExecution.getExitStatus().getExitDescription());
}
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositereader/CompositeItemReaderSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositereader/CompositeItemReaderSampleFunctionalTests.java
index 03db277a99..0119ab58c9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositereader/CompositeItemReaderSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositereader/CompositeItemReaderSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 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.
@@ -23,12 +23,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.item.database.JdbcBatchItemWriter;
@@ -59,11 +59,11 @@ record Person(int id, String name) {
void testJobLaunch() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java
index 5b909167da..f15d09e4d1 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/compositewriter/CompositeItemWriterSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -20,7 +20,6 @@
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
import javax.sql.DataSource;
@@ -29,7 +28,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.samples.domain.trade.Trade;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowCallbackHandler;
@@ -54,7 +53,7 @@ class CompositeItemWriterSampleFunctionalTests {
private JdbcTemplate jdbcTemplate;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
public void setDataSource(DataSource dataSource) {
@@ -66,7 +65,7 @@ void testJobLaunch() throws Exception {
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
int before = JdbcTestUtils.countRowsInTable(jdbcTemplate, "TRADE");
- jobLauncherTestUtils.launchJob();
+ jobOperatorTestUtils.startJob();
checkOutputFile("target/test-outputs/CustomerReport1.txt");
checkOutputFile("target/test-outputs/CustomerReport2.txt");
@@ -74,15 +73,12 @@ void testJobLaunch() throws Exception {
}
private void checkOutputTable(int before) {
- final List trades = new ArrayList<>() {
- {
- add(new Trade("UK21341EAH41", 211, new BigDecimal("31.11"), "customer1"));
- add(new Trade("UK21341EAH42", 212, new BigDecimal("32.11"), "customer2"));
- add(new Trade("UK21341EAH43", 213, new BigDecimal("33.11"), "customer3"));
- add(new Trade("UK21341EAH44", 214, new BigDecimal("34.11"), "customer4"));
- add(new Trade("UK21341EAH45", 215, new BigDecimal("35.11"), "customer5"));
- }
- };
+ final List trades = List.of( //
+ new Trade("UK21341EAH41", 211, new BigDecimal("31.11"), "customer1"),
+ new Trade("UK21341EAH42", 212, new BigDecimal("32.11"), "customer2"),
+ new Trade("UK21341EAH43", 213, new BigDecimal("33.11"), "customer3"),
+ new Trade("UK21341EAH44", 214, new BigDecimal("34.11"), "customer4"),
+ new Trade("UK21341EAH45", 215, new BigDecimal("35.11"), "customer5"));
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "TRADE");
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java
index e33a0eabe2..4961be1e00 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/delimited/DelimitedFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,12 +19,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -44,7 +44,7 @@
class DelimitedFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -55,7 +55,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -65,7 +65,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(DelimitedJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder()
.addString("inputFile", "org/springframework/batch/samples/file/delimited/data/delimited.csv")
@@ -73,7 +73,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java
index 3ce89133d7..561155a1e7 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/fixed/FixedLengthFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,12 +19,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -37,7 +37,7 @@
class FixedLengthFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -48,7 +48,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -58,7 +58,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(FixedLengthJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder()
.addString("inputFile", "org/springframework/batch/samples/file/fixed/data/fixedLength.txt")
@@ -66,7 +66,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java
index a0fc6a8448..96da9c593a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/json/JsonFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -22,11 +22,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.util.DigestUtils;
@@ -46,12 +46,12 @@ class JsonFunctionalTests {
@Test
void testJsonReadingAndWriting() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(JsonJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder().addString("inputFile", INPUT_FILE)
.addString("outputFile", "file:./" + OUTPUT_FILE)
.toJobParameters();
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
assertFileEquals(new File("src/main/resources/" + INPUT_FILE), new File(OUTPUT_FILE));
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java
index cb3dcaf027..06e7baa871 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -53,7 +53,7 @@ class MultiLineFunctionalTests {
private static final String OUTPUT_FILE = "target/test-outputs/multiLineOutput.txt";
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -62,7 +62,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -75,14 +75,14 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(MultiLineJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder().addString("inputFile", INPUT_FILE)
.addString("outputFile", "file:./" + OUTPUT_FILE)
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
index 1f85659a6b..3be5e8dc46 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,7 +21,7 @@
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
@@ -35,7 +35,7 @@
class MultilineAggregateJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
// The output is grouped together in two lines, instead of all the
// trades coming out on a single line.
@@ -46,7 +46,7 @@ class MultilineAggregateJobFunctionalTests {
@Test
void testJobLaunch() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
assertEquals(EXPECTED_RESULT,
StringUtils.replace(IOUtils.toString(output.getInputStream(), StandardCharsets.UTF_8),
System.getProperty("line.separator"), ""));
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java
index 8a1985d7e5..e5ecf3d65c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -53,7 +53,7 @@ class MultiRecordTypeFunctionalTests {
private static final String INPUT_FILE = "org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt";
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -63,7 +63,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -76,14 +76,14 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(MultiRecordTypeJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder().addString("inputFile", INPUT_FILE)
.addString("outputFile", "file:./" + OUTPUT_FILE)
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java
index b7522968b5..a0efe95281 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiresource/MultiResourceFunctionalTests.java
@@ -20,12 +20,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -45,7 +45,7 @@
class MultiResourceFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -56,7 +56,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -66,7 +66,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(MultiResourceJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder()
.addString("inputFiles", "org/springframework/batch/samples/file/multiresource/data/delimited*.csv")
@@ -74,7 +74,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java
index 6d6df834e4..d256ce902a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,15 +19,16 @@
import java.nio.file.Files;
import java.nio.file.Path;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+
@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/file/patternmatching/job/multilineOrderJob.xml",
"/simple-job-launcher-context.xml" })
class PatternMatchingJobFunctionalTests {
@@ -37,14 +38,14 @@ class PatternMatchingJobFunctionalTests {
private static final String EXPECTED = "org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt";
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testJobLaunch() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
Path expectedFile = new ClassPathResource(EXPECTED).getFile().toPath();
Path actualFile = new FileSystemResource(ACTUAL).getFile().toPath();
- Assertions.assertLinesMatch(Files.lines(expectedFile), Files.lines(actualFile));
+ assertLinesMatch(Files.lines(expectedFile), Files.lines(actualFile));
}
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java
index ea6d40ba5b..f852ad285c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/xml/XmlFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,12 +19,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -43,7 +43,7 @@
class XmlFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
@@ -54,7 +54,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -64,7 +64,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(XmlJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder()
.addString("inputFile", "org/springframework/batch/samples/file/xml/data/input.xml")
@@ -72,7 +72,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
.toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java
index 26aa4c3acf..f87dcd83c3 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/filter/CustomerFilterJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -27,8 +27,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -51,7 +51,7 @@ class CustomerFilterJobFunctionalTests {
private final Map credits = new HashMap<>();
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
public void setDataSource(DataSource dataSource) {
@@ -79,10 +79,10 @@ void tearDown() {
@Test
void testFilterJob() throws Exception {
- JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = jobOperatorTestUtils.startJob();
- customers = Arrays.asList(new Customer("customer1", (credits.get("customer1"))),
- new Customer("customer2", (credits.get("customer2"))), new Customer("customer3", 100500),
+ customers = Arrays.asList(new Customer("customer1", credits.get("customer1")),
+ new Customer("customer2", credits.get("customer2")), new Customer("customer3", 100500),
new Customer("customer4", credits.get("customer4")), new Customer("customer5", 32345),
new Customer("customer6", 123456));
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java
index c8aa20778d..2b936cdbe8 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/football/FootballJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2023 the original author or authors.
+ * Copyright 2007-2025 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.
@@ -19,10 +19,10 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -37,7 +37,7 @@
class FootballJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private JdbcTemplate jdbcTemplate;
@@ -50,7 +50,7 @@ public void setDataSource(DataSource dataSource) {
void testLaunchJobWithXmlConfiguration() throws Exception {
JdbcTestUtils.deleteFromTables(jdbcTemplate, "PLAYERS", "GAMES", "PLAYER_SUMMARY");
- jobLauncherTestUtils.launchJob();
+ jobOperatorTestUtils.startJob();
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "PLAYER_SUMMARY");
assertTrue(count > 0);
@@ -60,11 +60,11 @@ void testLaunchJobWithXmlConfiguration() throws Exception {
void testLaunchJobWithJavaConfiguration() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(FootballJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- jobLauncher.run(job, new JobParameters());
+ jobOperator.start(job, new JobParameters());
// then
int count = JdbcTestUtils.countRowsInTable(new JdbcTemplate(context.getBean(DataSource.class)),
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java
index 0ebf63b7f2..a276a47495 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/headerfooter/HeaderFooterSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -20,7 +20,7 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.io.Resource;
@@ -41,11 +41,11 @@ class HeaderFooterSampleFunctionalTests {
private Resource output;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testJob() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
BufferedReader inputReader = new BufferedReader(new FileReader(input.getFile()));
BufferedReader outputReader = new BufferedReader(new FileReader(output.getFile()));
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/helloworld/HelloWorldJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/helloworld/HelloWorldJobFunctionalTests.java
index 9dfcc75f44..d03bfe88b2 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/helloworld/HelloWorldJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/helloworld/HelloWorldJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -19,10 +19,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -34,11 +34,11 @@ class HelloWorldJobFunctionalTests {
public void testLaunchJob() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(HelloWorldJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java
index cf8f0463d5..74c16c21a8 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcCursorFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,12 +19,12 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.samples.jdbc.cursor.JdbcCursorReaderBatchWriterSampleJob;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -43,12 +43,12 @@
class JdbcCursorFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob();
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -58,11 +58,11 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JdbcCursorReaderBatchWriterSampleJob.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java
index cda54a4454..0cbc45fd05 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jdbc/JdbcPagingFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -19,13 +19,13 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.samples.jdbc.paging.JdbcPagingReaderBatchWriterSampleJob;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -44,17 +44,17 @@
class JdbcPagingFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
// given
- JobParameters jobParameters = jobLauncherTestUtils.getUniqueJobParametersBuilder()
+ JobParameters jobParameters = this.jobOperatorTestUtils.getUniqueJobParametersBuilder()
.addDouble("credit", 0.)
.toJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -64,12 +64,12 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JdbcPagingReaderBatchWriterSampleJob.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
JobParameters jobParameters = new JobParametersBuilder().addDouble("credit", 0.).toJobParameters();
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java
index 925b793162..49cbdca664 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jobstep/JobStepFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,10 +20,10 @@
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -47,7 +47,7 @@ class JobStepFunctionalTests {
private Job jobStepJob;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private JdbcTemplate jdbcTemplate;
@@ -58,13 +58,13 @@ public void setDataSource(DataSource dataSource) {
@Test
void testJobLaunch() throws Exception {
- jobLauncherTestUtils.setJob(jobStepJob);
+ jobOperatorTestUtils.setJob(jobStepJob);
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
JobParameters jobParameters = new JobParametersBuilder()
.addString("input.file", "org/springframework/batch/samples/jobstep/data/ImportTradeDataStep.txt")
.toJobParameters();
- jobLauncherTestUtils.launchJob(jobParameters);
+ jobOperatorTestUtils.startJob(jobParameters);
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "TRADE");
assertEquals(5, after);
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java
index e1d9a8373e..a43860a9b9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/JpaFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -18,10 +18,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -33,9 +33,9 @@
class JpaFunctionalTests {
@Test
- void testLaunchJobWithXmlConfig(@Autowired JobLauncher jobLauncher, @Autowired Job job) throws Exception {
+ void testLaunchJobWithXmlConfig(@Autowired JobOperator jobOperator, @Autowired Job job) throws Exception {
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -45,11 +45,11 @@ void testLaunchJobWithXmlConfig(@Autowired JobLauncher jobLauncher, @Autowired J
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JpaJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java
index 56cb54eb1f..61de737812 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/jpa/RepositoryFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 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.
@@ -18,11 +18,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -34,12 +34,12 @@
class RepositoryFunctionalTests {
@Test
- void testLaunchJobWithXmlConfig(@Autowired JobLauncher jobLauncher, @Autowired Job job) throws Exception {
+ void testLaunchJobWithXmlConfig(@Autowired JobOperator jobOperator, @Autowired Job job) throws Exception {
// given
JobParameters jobParameters = new JobParametersBuilder().addDouble("credit", 10000D).toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -49,12 +49,12 @@ void testLaunchJobWithXmlConfig(@Autowired JobLauncher jobLauncher, @Autowired J
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(JpaRepositoryJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
JobParameters jobParameters = new JobParametersBuilder().addDouble("credit", 10000D).toJobParameters();
// when
- JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobOperator.start(job, jobParameters);
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java
index f20794c5dd..21022b16ff 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loom/VirtualThreadsSupportTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -21,14 +21,14 @@
import org.junit.jupiter.api.condition.JRE;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.explore.JobExplorer;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.job.builder.FlowBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.support.TaskExecutorJobOperator;
import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler;
import org.springframework.batch.core.step.builder.TaskletStepBuilder;
import org.springframework.batch.core.step.tasklet.SystemCommandTasklet;
@@ -49,7 +49,7 @@
*
* Here are the places where a {@link TaskExecutor} is used in production code:
*
- *
{@link TaskExecutorJobLauncher#setTaskExecutor}: to launch jobs in background
+ *
{@link TaskExecutorJobOperator#setTaskExecutor}: to launch jobs in background
* threads
*
{@link TaskletStepBuilder#taskExecutor(TaskExecutor)}: to execute steps
* concurrently
@@ -73,17 +73,17 @@ public void testJobLaunchingWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForLaunchingJobsWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
- JobExplorer jobExplorer = context.getBean(JobExplorer.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
+ JobRepository jobRepository = context.getBean(JobRepository.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
// should wait for virtual threads to finish, otherwise the following assertion
// might be executed before the virtual thread running the job is finished
// and therefore will fail.
- while (jobExplorer.getJobExecution(jobExecution.getId()).isRunning()) {
+ while (jobRepository.getJobExecution(jobExecution.getId()).isRunning()) {
Thread.sleep(100);
}
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -100,10 +100,10 @@ public void testConcurrentStepsWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForRunningConcurrentStepsWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -119,10 +119,10 @@ public void testParallelStepsWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForRunningParallelStepsWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -134,10 +134,10 @@ public void testAsyncItemProcessingWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForAsynchronousItemProcessingWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -152,10 +152,10 @@ public void testLocalPartitioningWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForRunningPartitionedStepsWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -168,10 +168,10 @@ public void testSystemCommandTaskletWithVirtualThreads() throws Exception {
ApplicationContext context = new AnnotationConfigApplicationContext(
JobConfigurationForRunningSystemCommandTaskletsWithVirtualThreads.class);
Job job = context.getBean(Job.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java
index 910ebabe91..0f0b70cb81 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/loop/LoopFlowSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -18,7 +18,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.samples.domain.trade.internal.ItemTrackingTradeItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -41,11 +41,11 @@ class LoopFlowSampleFunctionalTests {
private ItemTrackingTradeItemWriter itemWriter;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testJobLaunch() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
// items processed = items read + 2 exceptions
assertEquals(10, itemWriter.getItems().size());
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java
index a9d57ce1dd..05e610e5fb 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/mail/MailJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -25,8 +25,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.mail.MailMessage;
@@ -68,7 +68,7 @@ class MailJobFunctionalTests {
private JdbcTemplate jdbcTemplate;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
private TestMailErrorHandler errorHandler;
@@ -97,7 +97,7 @@ void after() {
void testLaunchJob() throws Exception {
this.createUsers(new Object[][] { USER1, USER2_SKIP, USER3, USER4_SKIP, USER5, USER6, USER7, USER8 });
- JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = jobOperatorTestUtils.startJob();
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
List receivedMessages = mailSender.getReceivedMessages();
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java
index 82f75cc4f8..d9b59058ef 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/groovy/GroovyJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,7 +23,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -35,7 +35,7 @@
public class GroovyJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@BeforeEach
void removeOldData() throws IOException {
@@ -45,7 +45,7 @@ void removeOldData() throws IOException {
@Test
void testLaunchJob() throws Exception {
assertFalse(new File("target/groovyJob/output/files.zip").exists());
- jobLauncherTestUtils.launchJob();
+ jobOperatorTestUtils.startJob();
assertTrue(new File("target/groovyJob/output/files.zip").exists());
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java
index b3b91d0257..f573060466 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/jmx/RemoteLauncherTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2024 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -33,7 +33,11 @@
import java.util.List;
import java.util.Properties;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author Dave Syer
@@ -41,6 +45,7 @@
* @author Mahmoud Ben Hassine
*
*/
+@SuppressWarnings("removal")
class RemoteLauncherTests {
private static final Log logger = LogFactory.getLog(RemoteLauncherTests.class);
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java
deleted file mode 100644
index c9eb56edbc..0000000000
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/misc/quartz/JobLauncherDetailsTests.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2006-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.samples.misc.quartz;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.quartz.JobDetail;
-import org.quartz.JobExecutionContext;
-import org.quartz.impl.JobDetailImpl;
-import org.quartz.impl.JobExecutionContextImpl;
-import org.quartz.impl.triggers.SimpleTriggerImpl;
-import org.quartz.spi.TriggerFiredBundle;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
-import org.springframework.lang.Nullable;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Dave Syer
- * @author Glenn Renfro
- * @author Mahmoud Ben Hassine
- *
- */
-class JobLauncherDetailsTests {
-
- private final JobLauncherDetails details = new JobLauncherDetails();
-
- private TriggerFiredBundle firedBundle;
-
- private final List list = new ArrayList<>();
-
- @BeforeEach
- public void setUp() throws Exception {
- details.setJobLauncher((job, jobParameters) -> {
- list.add(jobParameters);
- return null;
- });
-
- details.setJobLocator(name -> {
- list.add(name);
- return new StubJob("foo");
- });
- }
-
- private JobExecutionContext createContext(JobDetail jobDetail) {
- firedBundle = new TriggerFiredBundle(jobDetail, new SimpleTriggerImpl(), null, false, new Date(), new Date(),
- new Date(), new Date());
- return new StubJobExecutionContext();
- }
-
- @Test
- void testExecuteWithNoJobParameters() {
- JobDetail jobDetail = new JobDetailImpl();
- JobExecutionContext context = createContext(jobDetail);
- details.executeInternal(context);
- assertEquals(2, list.size());
- JobParameters parameters = (JobParameters) list.get(1);
- assertEquals(0, parameters.getParameters().size());
- }
-
- @Test
- void testExecuteWithJobName() {
- JobDetail jobDetail = new JobDetailImpl();
- jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
- JobExecutionContext context = createContext(jobDetail);
- details.executeInternal(context);
- assertEquals(2, list.size());
- assertEquals("FOO", list.get(0));
- }
-
- @Test
- void testExecuteWithSomeJobParameters() {
- JobDetail jobDetail = new JobDetailImpl();
- jobDetail.getJobDataMap().put("foo", "bar");
- JobExecutionContext context = createContext(jobDetail);
- details.executeInternal(context);
- assertEquals(2, list.size());
- JobParameters parameters = (JobParameters) list.get(1);
- assertEquals(1, parameters.getParameters().size());
- }
-
- @Test
- void testExecuteWithJobNameAndParameters() {
- JobDetail jobDetail = new JobDetailImpl();
- jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
- jobDetail.getJobDataMap().put("foo", "bar");
- JobExecutionContext context = createContext(jobDetail);
- details.executeInternal(context);
- assertEquals(2, list.size());
- assertEquals("FOO", list.get(0));
- JobParameters parameters = (JobParameters) list.get(1);
- assertEquals(1, parameters.getParameters().size());
- }
-
- @Test
- void testExecuteWithJobNameAndComplexParameters() {
- JobDetail jobDetail = new JobDetailImpl();
- jobDetail.getJobDataMap().put(JobLauncherDetails.JOB_NAME, "FOO");
- jobDetail.getJobDataMap().put("foo", this);
- JobExecutionContext context = createContext(jobDetail);
- details.executeInternal(context);
- assertEquals(2, list.size());
- assertEquals("FOO", list.get(0));
- JobParameters parameters = (JobParameters) list.get(1);
- // Silently ignore parameters that are not simple types
- assertEquals(0, parameters.getParameters().size());
- }
-
- private final class StubJobExecutionContext extends JobExecutionContextImpl {
-
- private StubJobExecutionContext() {
- super(mock(), firedBundle, mock());
- }
-
- }
-
- private static class StubJob implements org.springframework.batch.core.Job {
-
- private final String name;
-
- public StubJob(String name) {
- this.name = name;
- }
-
- @Override
- public void execute(JobExecution execution) {
- }
-
- @Nullable
- @Override
- public JobParametersIncrementer getJobParametersIncrementer() {
- return null;
- }
-
- @Override
- public JobParametersValidator getJobParametersValidator() {
- return null;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public boolean isRestartable() {
- return false;
- }
-
- }
-
-}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java
index 7b02c19379..7a9e3959ea 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/file/PartitionFileJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,13 +24,13 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.samples.domain.trade.CustomerCredit;
import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -50,7 +50,7 @@ class PartitionFileJobFunctionalTests implements ApplicationContextAware {
private ItemReader inputReader;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private ApplicationContext applicationContext;
@@ -71,7 +71,7 @@ void testUpdateCredit() throws Exception {
List inputs = new ArrayList<>(getCredits(inputReader));
close(inputReader);
- JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = jobOperatorTestUtils.startJob();
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@SuppressWarnings("unchecked")
@@ -85,7 +85,6 @@ void testUpdateCredit() throws Exception {
int itemCount = inputs.size();
assertTrue(itemCount > 0, "No entries were available in the input");
- inputs.iterator();
for (int i = 0; i < itemCount; i++) {
assertEquals(inputs.get(i).getCredit().add(CustomerCreditIncreaseProcessor.FIXED_AMOUNT).intValue(),
outputs.get(i).getCredit().intValue());
@@ -110,8 +109,8 @@ private Set getCredits(ItemReader reader) throws
* Open the reader if applicable.
*/
private void open(ItemReader reader) {
- if (reader instanceof ItemStream) {
- ((ItemStream) reader).open(new ExecutionContext());
+ if (reader instanceof ItemStream itemStream) {
+ itemStream.open(new ExecutionContext());
}
}
@@ -119,8 +118,8 @@ private void open(ItemReader reader) {
* Close the reader if applicable.
*/
private void close(ItemReader reader) {
- if (reader instanceof ItemStream) {
- ((ItemStream) reader).close();
+ if (reader instanceof ItemStream itemStream) {
+ itemStream.close();
}
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java
index 97719a96d7..c0c414e90e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/jdbc/PartitionJdbcJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,13 +24,13 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.samples.domain.trade.CustomerCredit;
import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -50,7 +50,7 @@ class PartitionJdbcJobFunctionalTests implements ApplicationContextAware {
private ItemReader inputReader;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private ApplicationContext applicationContext;
@@ -71,7 +71,7 @@ void testUpdateCredit() throws Exception {
List inputs = new ArrayList<>(getCredits(inputReader));
close(inputReader);
- JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = jobOperatorTestUtils.startJob();
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@SuppressWarnings("unchecked")
@@ -85,7 +85,6 @@ void testUpdateCredit() throws Exception {
int itemCount = inputs.size();
assertTrue(itemCount > 0, "Input from reader has no entries.");
- inputs.iterator();
for (int i = 0; i < itemCount; i++) {
assertEquals(inputs.get(i).getCredit().add(CustomerCreditIncreaseProcessor.FIXED_AMOUNT).intValue(),
outputs.get(i).getCredit().intValue());
@@ -109,8 +108,8 @@ private Set getCredits(ItemReader reader) throws
* Open the reader if applicable.
*/
private void open(ItemReader reader) {
- if (reader instanceof ItemStream) {
- ((ItemStream) reader).open(new ExecutionContext());
+ if (reader instanceof ItemStream itemStream) {
+ itemStream.open(new ExecutionContext());
}
}
@@ -118,8 +117,8 @@ private void open(ItemReader reader) {
* Close the reader if applicable.
*/
private void close(ItemReader reader) {
- if (reader instanceof ItemStream) {
- ((ItemStream) reader).close();
+ if (reader instanceof ItemStream itemStream) {
+ itemStream.close();
}
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java
index 6025175727..2dea8b7462 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/partition/remote/RemotePartitioningJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -25,10 +25,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -54,7 +54,7 @@ public abstract class RemotePartitioningJobFunctionalTests {
private String brokerUrl;
@Autowired
- protected JobLauncher jobLauncher;
+ protected JobOperator jobOperator;
@Autowired
private DataSource dataSource;
@@ -85,12 +85,12 @@ void setUp() throws Exception {
@Test
void testRemotePartitioningJob(@Autowired Job job) throws Exception {
// when
- JobExecution jobExecution = this.jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = this.jobOperator.start(job, new JobParameters());
// then
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
- assertEquals(4, jobExecution.getStepExecutions().size()); // manager + 3
- // workers
+ // Expecting 4 StepExecution instances: manager + 3 workers
+ assertEquals(4, jobExecution.getStepExecutions().size());
}
@AfterEach
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
index dc8bfce26b..9df598db32 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
@@ -24,11 +24,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -41,7 +41,7 @@
class PetClinicJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@BeforeEach
@AfterEach
@@ -52,7 +52,7 @@ public void deleteOwnersFile() throws IOException {
@Test
void testLaunchJobWithXmlConfiguration() throws Exception {
// when
- JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = jobOperatorTestUtils.startJob();
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
@@ -62,11 +62,11 @@ void testLaunchJobWithXmlConfiguration() throws Exception {
void testLaunchJobWithJavaConfiguration() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(OwnersExportJobConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java
index 221d658d2f..85e29f70d9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/processindicator/ProcessIndicatorJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -35,7 +35,7 @@
class ProcessIndicatorJobFunctionalTests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private JdbcTemplate jdbcTemplate;
@@ -47,7 +47,7 @@ public void setDataSource(DataSource dataSource) {
@Test
void testLaunchJob() throws Exception {
int before = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STAGING");
- JobExecution execution = jobLauncherTestUtils.launchJob();
+ JobExecution execution = jobOperatorTestUtils.startJob();
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STAGING");
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(after - before, execution.getStepExecutions().iterator().next().getReadCount());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java
index 2efbe557b0..a87608b349 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/fail/RestartFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,10 +21,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.support.PropertiesConverter;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -49,7 +49,7 @@ class RestartFunctionalTests {
private JdbcTemplate jdbcTemplate;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
public void setDataSource(DataSource dataSource) {
@@ -91,8 +91,8 @@ void testLaunchJob() throws Exception {
// load the application context and launch the job
private JobExecution runJobForRestartTest() throws Exception {
- return jobLauncherTestUtils
- .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
+ return jobOperatorTestUtils
+ .startJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
"input.file=classpath:org/springframework/batch/samples/restart/fail/data/ImportTradeDataStep.txt")));
}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java
index 20c8a11e03..37ae48506c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/GracefulShutdownFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -21,11 +21,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.launch.JobOperator;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -35,7 +35,7 @@
/**
* Functional test for graceful shutdown. A batch container is started in a new thread,
- * then it's stopped using {@link JobOperator#stop(long)}.
+ * then it's stopped using {@link JobOperator#stop}.
*
* @author Lucas Ward
* @author Parikshit Dutta
@@ -43,15 +43,14 @@
* @author Mahmoud Ben Hassine
*
*/
-@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml",
- "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml" })
+@SpringJUnitConfig(locations = { "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml" })
class GracefulShutdownFunctionalTests {
/** Logger */
private final Log logger = LogFactory.getLog(getClass());
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
private JobOperator jobOperator;
@@ -61,14 +60,14 @@ void testLaunchJob() throws Exception {
final JobParameters jobParameters = new JobParametersBuilder().addLong("timestamp", System.currentTimeMillis())
.toJobParameters();
- JobExecution jobExecution = jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = jobOperatorTestUtils.startJob(jobParameters);
Thread.sleep(1000);
assertEquals(BatchStatus.STARTED, jobExecution.getStatus());
assertTrue(jobExecution.isRunning());
- jobOperator.stop(jobExecution.getId());
+ jobOperator.stop(jobExecution);
int count = 0;
while (jobExecution.isRunning() && count <= 10) {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java
deleted file mode 100644
index 88c5b0e94a..0000000000
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/restart/stop/JobOperatorFunctionalTests.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2008-2023 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.samples.restart.stop;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.configuration.support.ReferenceJobFactory;
-import org.springframework.batch.core.launch.JobOperator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml",
- "/org/springframework/batch/samples/restart/stop/stopRestartSample.xml" })
-class JobOperatorFunctionalTests {
-
- private static final Log LOG = LogFactory.getLog(JobOperatorFunctionalTests.class);
-
- @Autowired
- private JobOperator operator;
-
- @Autowired
- private Job job;
-
- @Autowired
- private JobRegistry jobRegistry;
-
- @BeforeEach
- void setUp() throws Exception {
- if (!jobRegistry.getJobNames().contains(job.getName())) {
- jobRegistry.register(new ReferenceJobFactory(job));
- }
- }
-
- @Test
- void testStartStopResumeJob() throws Exception {
- String params = "jobOperatorTestParam=7,java.lang.Long,true";
- Properties properties = new Properties();
- properties.setProperty("jobOperatorTestParam", "7,java.lang.Long,true");
-
- long executionId = operator.start(job.getName(), properties);
- assertEquals(params, operator.getParameters(executionId));
- stopAndCheckStatus(executionId);
-
- long resumedExecutionId = operator.restart(executionId);
- assertEquals(params, operator.getParameters(resumedExecutionId));
- stopAndCheckStatus(resumedExecutionId);
-
- List instances = operator.getJobInstances(job.getName(), 0, 1);
- assertEquals(1, instances.size());
- long instanceId = instances.get(0);
-
- List executions = operator.getExecutions(instanceId);
- assertEquals(2, executions.size());
- // latest execution is the first in the returned list
- assertEquals(resumedExecutionId, executions.get(0).longValue());
- assertEquals(executionId, executions.get(1).longValue());
- }
-
- /**
- * @param executionId id of running job execution
- */
- private void stopAndCheckStatus(long executionId) throws Exception {
- // wait to the job to get up and running
- Thread.sleep(1000);
-
- Set runningExecutions = operator.getRunningExecutions(job.getName());
- assertTrue(runningExecutions.contains(executionId),
- "Wrong executions: " + runningExecutions + " expected: " + executionId);
- assertTrue(operator.getSummary(executionId).contains(BatchStatus.STARTED.toString()),
- "Wrong summary: " + operator.getSummary(executionId));
-
- operator.stop(executionId);
-
- int count = 0;
- while (operator.getRunningExecutions(job.getName()).contains(executionId) && count <= 10) {
- LOG.info("Checking for running JobExecution: count=" + count);
- Thread.sleep(100);
- count++;
- }
-
- runningExecutions = operator.getRunningExecutions(job.getName());
- assertFalse(runningExecutions.contains(executionId),
- "Wrong executions: " + runningExecutions + " expected: " + executionId);
- assertTrue(operator.getSummary(executionId).contains(BatchStatus.STOPPED.toString()),
- "Wrong summary: " + operator.getSummary(executionId));
-
- // there is just a single step in the test job
- Map summaries = operator.getStepExecutionSummaries(executionId);
- LOG.info(summaries);
- assertTrue(summaries.values().toString().contains(BatchStatus.STOPPED.toString()));
- }
-
- @Test
- void testMultipleSimultaneousInstances() throws Exception {
- String jobName = job.getName();
-
- Set names = operator.getJobNames();
- assertEquals(1, names.size());
- assertTrue(names.contains(jobName));
-
- long exec1 = operator.startNextInstance(jobName);
- long exec2 = operator.startNextInstance(jobName);
-
- assertTrue(exec1 != exec2);
- assertNotEquals(operator.getParameters(exec1), operator.getParameters(exec2));
-
- // Give the asynchronous task executor a chance to start executions
- Thread.sleep(1000);
-
- Set executions = operator.getRunningExecutions(jobName);
- assertTrue(executions.contains(exec1));
- assertTrue(executions.contains(exec2));
-
- int count = 0;
- boolean running = operator.getSummary(exec1).contains("STARTED")
- && operator.getSummary(exec2).contains("STARTED");
-
- while (count++ < 10 && !running) {
- Thread.sleep(100L);
- running = operator.getSummary(exec1).contains("STARTED") && operator.getSummary(exec2).contains("STARTED");
- }
-
- assertTrue(running, String.format("Jobs not started: [%s] and [%s]", operator.getSummary(exec1),
- operator.getSummary(exec1)));
-
- operator.stop(exec1);
- operator.stop(exec2);
- }
-
-}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java
index 48fdb57b91..8f0c558962 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/retry/RetrySampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -18,13 +18,13 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.samples.domain.trade.internal.GeneratingTradeItemReader;
import org.springframework.batch.samples.support.RetrySampleItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -51,11 +51,11 @@ class RetrySampleFunctionalTests {
private RetrySampleItemWriter itemProcessor;
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Test
void testLaunchJobWithXmlConfig() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
// items processed = items read + 2 exceptions
assertEquals(itemGenerator.getLimit() + 2, itemProcessor.getCounter());
}
@@ -64,13 +64,13 @@ void testLaunchJobWithXmlConfig() throws Exception {
public void testLaunchJobWithJavaConfig() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(RetrySampleConfiguration.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
GeneratingTradeItemReader itemGenerator = context.getBean(GeneratingTradeItemReader.class);
RetrySampleItemWriter itemProcessor = context.getBean(RetrySampleItemWriter.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java
index 1edfdab192..acaceb7146 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/skip/SkipSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2023 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -26,14 +26,13 @@
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
-import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.launch.JobParametersNotFoundException;
import org.springframework.batch.core.launch.NoSuchJobException;
@@ -69,7 +68,7 @@ class SkipSampleFunctionalTests {
private JdbcTemplate jdbcTemplate;
@Autowired
- private JobExplorer jobExplorer;
+ private JobRepository jobRepository;
@Autowired
private JobOperator jobOperator;
@@ -157,7 +156,7 @@ void testJobIncrementing() {
// Launch 1
//
long id1 = launchJobWithIncrementer();
- JobExecution execution1 = jobExplorer.getJobExecution(id1);
+ JobExecution execution1 = jobRepository.getJobExecution(id1);
assertEquals(BatchStatus.COMPLETED, execution1.getStatus());
validateLaunchWithSkips(execution1);
@@ -171,7 +170,7 @@ void testJobIncrementing() {
// Launch 2
//
long id2 = launchJobWithIncrementer();
- JobExecution execution2 = jobExplorer.getJobExecution(id2);
+ JobExecution execution2 = jobRepository.getJobExecution(id2);
assertEquals(BatchStatus.COMPLETED, execution2.getStatus());
validateLaunchWithoutSkips(execution2);
@@ -193,11 +192,11 @@ void testJobIncrementing() {
void testSkippableExceptionDuringRead() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(SkippableExceptionDuringReadSample.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
@@ -217,11 +216,11 @@ void testSkippableExceptionDuringProcess() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(
SkippableExceptionDuringProcessSample.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
@@ -242,11 +241,11 @@ void testSkippableExceptionDuringProcess() throws Exception {
void testSkippableExceptionDuringWrite() throws Exception {
// given
ApplicationContext context = new AnnotationConfigApplicationContext(SkippableExceptionDuringWriteSample.class);
- JobLauncher jobLauncher = context.getBean(JobLauncher.class);
+ JobOperator jobOperator = context.getBean(JobOperator.class);
Job job = context.getBean(Job.class);
// when
- JobExecution jobExecution = jobLauncher.run(job, new JobParameters());
+ JobExecution jobExecution = jobOperator.start(job, new JobParameters());
// then
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
@@ -312,6 +311,7 @@ private Map getStepExecutionAsMap(JobExecution jobExecution, Str
* Launch the entire job, including all steps, in order.
* @return JobExecution, so that the test may validate the exit status
*/
+ @SuppressWarnings("removal")
public long launchJobWithIncrementer() {
SkipCheckingListener.resetProcessSkips();
try {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java
index 88297d3034..9f78a9693b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/trade/TradeJobFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -29,7 +29,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.samples.domain.trade.Trade;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -56,7 +56,7 @@ class TradeJobFunctionalTests {
private final Map credits = new HashMap<>();
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
public void setDataSource(DataSource dataSource) {
@@ -80,7 +80,7 @@ void tearDown() {
@Test
void testLaunchJob() throws Exception {
- this.jobLauncherTestUtils.launchJob();
+ this.jobOperatorTestUtils.startJob();
customers = Arrays.asList(new Customer("customer1", (credits.get("customer1") - 98.34)),
new Customer("customer2", (credits.get("customer2") - 18.12 - 12.78)),
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java
index 760799c3d3..f8b0a23b7c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/validation/ValidationSampleFunctionalTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -21,10 +21,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.item.support.ListItemWriter;
import org.springframework.batch.samples.validation.domain.Person;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ class ValidationSampleFunctionalTests {
private Job job;
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private ListItemWriter listItemWriter;
@@ -54,7 +54,7 @@ void testItemValidation() throws Exception {
JobParameters jobParameters = new JobParameters();
// when
- JobExecution jobExecution = this.jobLauncher.run(this.job, jobParameters);
+ JobExecution jobExecution = this.jobOperator.start(this.job, jobParameters);
// then
assertEquals(ExitStatus.COMPLETED.getExitCode(), jobExecution.getExitStatus().getExitCode());
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index c9f92b858f..4134581b12 100644
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -4,7 +4,7 @@
org.springframework.batchspring-batch
- 5.2.2
+ 6.0.0-M1spring-batch-testSpring Batch Test
@@ -79,6 +79,12 @@
${junit-vintage-engine.version}test
+
+ org.junit.platform
+ junit-platform-launcher
+ ${junit-platform-launcher.version}
+ test
+ org.mockitomockito-core
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java
index 9d143d80b6..f3bbdbbf53 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java
@@ -19,8 +19,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.lang.Nullable;
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java
index b1a4da0f27..1acb5ad071 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobLauncherTestUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -23,12 +23,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.job.AbstractJob;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.job.flow.FlowJob;
@@ -66,21 +66,25 @@
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.1
+ * @deprecated Since 6.0 in favor of {@link JobOperatorTestUtils}. Scheduled for removal
+ * in 6.2 or later.
*/
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
public class JobLauncherTestUtils {
- private final SecureRandom secureRandom = new SecureRandom();
+ protected final SecureRandom secureRandom = new SecureRandom();
/** Logger */
protected final Log logger = LogFactory.getLog(getClass());
- private JobLauncher jobLauncher;
+ protected JobLauncher jobLauncher;
- private Job job;
+ protected Job job;
- private JobRepository jobRepository;
+ protected JobRepository jobRepository;
- private StepRunner stepRunner;
+ protected StepRunner stepRunner;
/**
* The Job instance that can be manipulated (e.g. launched) in this utility.
@@ -131,7 +135,10 @@ public JobLauncher getJobLauncher() {
* Launch the entire job, including all steps.
* @return JobExecution, so that the test can validate the exit status
* @throws Exception thrown if error occurs launching the job.
+ * @deprecated Since 6.0 in favor of {@link JobOperatorTestUtils#startJob()}.
+ * Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public JobExecution launchJob() throws Exception {
return this.launchJob(this.getUniqueJobParameters());
}
@@ -141,7 +148,11 @@ public JobExecution launchJob() throws Exception {
* @param jobParameters instance of {@link JobParameters}.
* @return JobExecution, so that the test can validate the exit status
* @throws Exception thrown if error occurs launching the job.
+ * @deprecated Since 6.0 in favor of
+ * {@link JobOperatorTestUtils#startJob(JobParameters)}. Scheduled for removal in 6.2
+ * or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public JobExecution launchJob(JobParameters jobParameters) throws Exception {
return getJobLauncher().run(this.job, jobParameters);
}
@@ -183,7 +194,10 @@ protected StepRunner getStepRunner() {
* Step with the given name.
* @param stepName The name of the step to launch
* @return JobExecution
+ * @deprecated Since 6.0 in favor of {@link JobOperatorTestUtils#startStep(String)}.
+ * Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public JobExecution launchStep(String stepName) {
return this.launchStep(stepName, this.getUniqueJobParameters(), null);
}
@@ -223,7 +237,11 @@ public JobExecution launchStep(String stepName, JobParameters jobParameters) {
* @param jobExecutionContext An ExecutionContext whose values will be loaded into the
* Job ExecutionContext prior to launching the step.
* @return JobExecution
+ * @deprecated Since 6.0 in favor of
+ * {@link JobOperatorTestUtils#startStep(String, JobParameters, ExecutionContext)}.
+ * Scheduled for removal in 6.2 or later.
*/
+ @Deprecated(since = "6.0", forRemoval = true)
public JobExecution launchStep(String stepName, JobParameters jobParameters,
@Nullable ExecutionContext jobExecutionContext) {
if (!(job instanceof StepLocator)) {
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobOperatorTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobOperatorTestUtils.java
new file mode 100644
index 0000000000..ca6795b34a
--- /dev/null
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobOperatorTestUtils.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2025 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.batch.core.job.AbstractJob;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.SimpleJob;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.flow.FlowJob;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepLocator;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.Assert;
+
+/**
+ *
+ * Utility class for testing batch jobs. It provides methods for starting an entire
+ * {@link AbstractJob}, allowing for end-to-end testing of individual steps, without
+ * having to run every step in the job. Any test classes using this utility can set up an
+ * instance in the {@link ApplicationContext} as part of the Spring test framework. The
+ * test context must contain batch infrastructure beans (ie a {@link JobRepository} and a
+ * {@link JobOperator}) as well as the job under test. The job under test will be
+ * autowired into this utility.
+ *
+ *
+ *
+ * This class also provides the ability to run {@link Step}s individually from a
+ * {@link SimpleJob} {@link FlowJob}. By starting {@link Step}s within a {@link Job} on
+ * their own, end-to-end testing of individual steps can be performed without having to
+ * run every step in the job.
+ *
+ *
+ *
+ * It should be noted that using any of the methods that don't contain
+ * {@link JobParameters} in their signature, will result in one being created with a
+ * random number of type {@code long} as a parameter. This will ensure restartability when
+ * no parameters are provided.
+ *
+ *
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ *
+ */
+@SuppressWarnings("removal")
+public class JobOperatorTestUtils extends JobLauncherTestUtils {
+
+ /**
+ * Name of the single-step job surrounding steps when tested individually
+ */
+ public static final String JOB_NAME = "TestJob";
+
+ protected JobOperator jobOperator;
+
+ /**
+ * Create a new instance of {@link JobOperatorTestUtils} with the provided job
+ * repository and job operator.
+ * @param jobOperator to use to start jobs and steps
+ * @param jobRepository to use to access job metadata
+ */
+ public JobOperatorTestUtils(JobOperator jobOperator, JobRepository jobRepository) {
+ Assert.notNull(jobOperator, "JobRepository must not be null");
+ Assert.notNull(jobRepository, "JobRepository must not be null");
+ this.jobOperator = jobOperator;
+ this.jobRepository = jobRepository;
+ }
+
+ /**
+ * Set the job that can be operated by this utility.
+ * @param job the job to test
+ */
+ public void setJob(Job job) {
+ this.job = job;
+ }
+
+ /**
+ * Set the job operator to be used by this utility.
+ * @param jobOperator the job operator to use to start jobs and steps
+ */
+ public void setJobOperator(JobOperator jobOperator) {
+ this.jobOperator = jobOperator;
+ }
+
+ /**
+ * Set the job repository to be used by this utility.
+ * @param jobRepository the job repository to use to access job metadata
+ */
+ public void setJobRepository(JobRepository jobRepository) {
+ this.jobRepository = jobRepository;
+ }
+
+ /**
+ * Start the entire job, including all steps, with a set of unique random job
+ * parameters.
+ * @return JobExecution, so that the test can validate the exit status
+ * @throws Exception thrown if error occurs launching the job.
+ */
+ public JobExecution startJob() throws Exception {
+ return this.startJob(super.getUniqueJobParameters());
+ }
+
+ /**
+ * Start the entire job, including all steps, with the provided set of job parameters.
+ * @param jobParameters instance of {@link JobParameters}.
+ * @return JobExecution, so that the test can validate the exit status
+ * @throws Exception thrown if error occurs launching the job.
+ */
+ public JobExecution startJob(JobParameters jobParameters) throws Exception {
+ return this.jobOperator.start(this.job, jobParameters);
+ }
+
+ /**
+ * Start just the specified step in a surrounding single-step job of type
+ * {@link SimpleJob} named {@link #JOB_NAME}. A unique set of JobParameters will
+ * automatically be generated. An IllegalStateException is thrown if there is no Step
+ * with the given name.
+ * @param stepName The name of the step to launch
+ * @return JobExecution
+ */
+ public JobExecution startStep(String stepName) {
+ return this.startStep(stepName, this.getUniqueJobParameters(), new ExecutionContext());
+ }
+
+ /**
+ * Extract the step from the injected job and start it in a surrounding single-step
+ * job of type {@link SimpleJob} named {@link #JOB_NAME}. An IllegalStateException is
+ * thrown if there is no Step with the given name.
+ * @param stepName The name of the step to start
+ * @param jobParameters The JobParameters to use during the start
+ * @param jobExecutionContext An ExecutionContext whose values will be loaded into the
+ * Job ExecutionContext before starting the step.
+ * @return JobExecution
+ */
+ public JobExecution startStep(String stepName, JobParameters jobParameters, ExecutionContext jobExecutionContext) {
+ if (!(job instanceof StepLocator)) {
+ throw new UnsupportedOperationException("Cannot locate step from a Job that is not a StepLocator: job="
+ + job.getName() + " does not implement StepLocator");
+ }
+ StepLocator locator = (StepLocator) this.job;
+ Step step = locator.getStep(stepName);
+ if (step == null) {
+ step = locator.getStep(this.job.getName() + "." + stepName);
+ }
+ if (step == null) {
+ throw new IllegalStateException("No Step found with name: [" + stepName + "]");
+ }
+
+ return startStep(step, jobParameters, jobExecutionContext);
+ }
+
+ /**
+ * Start just the specified step with a unique set of job parameters in a surrounding
+ * single-step job of type {@link SimpleJob} named {@link StepRunner#JOB_NAME}. An
+ * IllegalStateException is thrown if there is no Step with the given name.
+ * @param step The step to start
+ * @return JobExecution
+ */
+ public JobExecution startStep(Step step) {
+ return startStep(step, getUniqueJobParameters(), new ExecutionContext());
+ }
+
+ /**
+ * Start just the specified step in a surrounding single-step job of type
+ * {@link SimpleJob} named {@link StepRunner#JOB_NAME}. An IllegalStateException is
+ * thrown if there is no Step with the given name.
+ * @param step The step to start
+ * @param jobParameters The JobParameters to use during the start
+ * @param jobExecutionContext An ExecutionContext whose values will be loaded into the
+ * Job ExecutionContext before starting the step.
+ * @return JobExecution
+ */
+ public JobExecution startStep(Step step, JobParameters jobParameters, ExecutionContext jobExecutionContext) {
+ // Create a fake job
+ SimpleJob job = new SimpleJob();
+ job.setName(JOB_NAME);
+ job.setJobRepository(this.jobRepository);
+
+ List stepsToExecute = new ArrayList<>();
+ stepsToExecute.add(step);
+ job.setSteps(stepsToExecute);
+
+ // Dump the given Job ExecutionContext using a listener
+ if (jobExecutionContext != null && !jobExecutionContext.isEmpty()) {
+ job.setJobExecutionListeners(new JobExecutionListener[] { new JobExecutionListener() {
+ @Override
+ public void beforeJob(JobExecution jobExecution) {
+ ExecutionContext jobContext = jobExecution.getExecutionContext();
+ for (Map.Entry entry : jobExecutionContext.entrySet()) {
+ jobContext.put(entry.getKey(), entry.getValue());
+ }
+ }
+ } });
+ }
+
+ // Launch the job
+ try {
+ return this.jobOperator.start(job, jobParameters);
+ }
+ catch (NoSuchJobException | JobExecutionAlreadyRunningException | JobRestartException
+ | JobInstanceAlreadyCompleteException | JobParametersInvalidException e) {
+ throw new UnexpectedJobExecutionException("Step runner encountered exception.", e);
+ }
+ }
+
+ /**
+ * @return a new {@link JobParameters} object containing only a parameter with a
+ * random number of type {@code long}, to ensure that the job instance will be unique.
+ */
+ public JobParameters getUniqueJobParameters() {
+ return super.getUniqueJobParameters();
+ }
+
+ /**
+ * @return a new {@link JobParametersBuilder} object containing only a parameter with
+ * a random number of type {@code long}, to ensure that the job instance will be
+ * unique.
+ */
+ public JobParametersBuilder getUniqueJobParametersBuilder() {
+ return super.getUniqueJobParametersBuilder();
+ }
+
+}
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java
index d6a7b07327..d4cee99af9 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -20,16 +20,17 @@
import java.util.Collections;
import java.util.List;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.lang.Nullable;
/**
@@ -39,6 +40,7 @@
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
*/
public class JobRepositoryTestUtils {
@@ -136,7 +138,12 @@ public void removeJobExecutions(Collection jobExecutions) {
removeJobExecution(jobExecution);
}
for (JobExecution jobExecution : jobExecutions) {
- this.jobRepository.deleteJobInstance(jobExecution.getJobInstance());
+ try {
+ this.jobRepository.deleteJobInstance(jobExecution.getJobInstance());
+ }
+ catch (OptimisticLockingFailureException ignore) {
+ // same job instance may be already deleted
+ }
}
}
@@ -159,16 +166,16 @@ public void removeJobExecutions() {
for (String jobName : jobNames) {
int start = 0;
int count = 100;
- List jobInstances = this.jobRepository.findJobInstancesByName(jobName, start, count);
+ List jobInstances = this.jobRepository.getJobInstances(jobName, start, count);
while (!jobInstances.isEmpty()) {
for (JobInstance jobInstance : jobInstances) {
- List jobExecutions = this.jobRepository.findJobExecutions(jobInstance);
+ List jobExecutions = this.jobRepository.getJobExecutions(jobInstance);
if (jobExecutions != null && !jobExecutions.isEmpty()) {
removeJobExecutions(jobExecutions);
}
}
start += count;
- jobInstances = this.jobRepository.findJobInstancesByName(jobName, start, count);
+ jobInstances = this.jobRepository.getJobInstances(jobName, start, count);
}
}
}
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.java
index 5376d5a87a..d51ad56079 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestExecutionListener.java
@@ -17,7 +17,7 @@
import java.lang.reflect.Method;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.scope.context.JobContext;
import org.springframework.batch.core.scope.context.JobSynchronizationManager;
import org.springframework.batch.item.adapter.HippyMethodInvoker;
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestUtils.java
index 8c0d4391a0..c9ffc58dd7 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestUtils.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobScopeTestUtils.java
@@ -17,7 +17,7 @@
import java.util.concurrent.Callable;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.scope.JobScope;
import org.springframework.batch.core.scope.context.JobSynchronizationManager;
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java b/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java
index 9ade608be6..f506b594cf 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java
@@ -17,10 +17,10 @@
import java.util.Collection;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
/**
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java
index 2f1bc86801..673f30d684 100755
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 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.
@@ -24,14 +24,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.listener.JobExecutionListener;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -63,7 +63,12 @@
* @author Mahmoud Ben Hassine
* @since 2.0
* @see SimpleJob
+ * @deprecated since 6.0 in favor of
+ * {@link JobOperatorTestUtils#startStep(String, JobParameters, ExecutionContext)}.
+ * Scheduled for removal in 6.2 or later
*/
+@SuppressWarnings("removal")
+@Deprecated(since = "6.0", forRemoval = true)
public class StepRunner {
/**
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java
index 1deea865bd..8d6a6eea44 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java
@@ -17,7 +17,7 @@
import java.lang.reflect.Method;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.StepContext;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.batch.item.adapter.HippyMethodInvoker;
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestUtils.java
index 93e26151f2..839aacb8c7 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestUtils.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestUtils.java
@@ -17,7 +17,7 @@
import java.util.concurrent.Callable;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.StepScope;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessor.java b/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessor.java
index ca3046f4df..5eea9814c7 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessor.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -15,10 +15,10 @@
*/
package org.springframework.batch.test.context;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.batch.test.JobRepositoryTestUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ObjectProvider;
@@ -27,19 +27,20 @@
/**
* {@link BeanPostProcessor} implementation that injects a job bean into
- * {@link JobLauncherTestUtils} if there is a unique job bean.
+ * {@link JobOperatorTestUtils} if there is a unique job bean.
*
* @author Henning Pöttker
* @author Mahmoud Ben Hassine
* @since 5.0
*/
+@SuppressWarnings("removal")
public class BatchTestContextBeanPostProcessor implements BeanPostProcessor {
private ObjectProvider jobProvider;
private ObjectProvider jobRepositoryProvider;
- private ObjectProvider jobLauncherProvider;
+ private ObjectProvider jobOperatorProvider;
@Autowired
public void setJobProvider(ObjectProvider jobProvider) {
@@ -52,16 +53,16 @@ public void setJobRepositoryProvider(ObjectProvider jobRepository
}
@Autowired
- public void setJobLauncherProvider(ObjectProvider jobLauncherProvider) {
- this.jobLauncherProvider = jobLauncherProvider;
+ public void setJobOperatorProvider(ObjectProvider jobOperatorProvider) {
+ this.jobOperatorProvider = jobOperatorProvider;
}
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (bean instanceof JobLauncherTestUtils jobLauncherTestUtils) {
- this.jobProvider.ifUnique(jobLauncherTestUtils::setJob);
- this.jobRepositoryProvider.ifUnique(jobLauncherTestUtils::setJobRepository);
- this.jobLauncherProvider.ifUnique(jobLauncherTestUtils::setJobLauncher);
+ if (bean instanceof JobOperatorTestUtils jobOperatorTestUtils) {
+ this.jobProvider.ifUnique(jobOperatorTestUtils::setJob);
+ this.jobRepositoryProvider.ifUnique(jobOperatorTestUtils::setJobRepository);
+ this.jobOperatorProvider.ifUnique(jobOperatorTestUtils::setJobOperator);
}
if (bean instanceof JobRepositoryTestUtils jobRepositoryTestUtils) {
this.jobRepositoryProvider.ifUnique(jobRepositoryTestUtils::setJobRepository);
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextCustomizer.java b/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextCustomizer.java
index baeca9ad6a..fec8ec2f72 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextCustomizer.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/context/BatchTestContextCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -16,7 +16,7 @@
package org.springframework.batch.test.context;
import org.springframework.aot.AotDetector;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.batch.test.JobRepositoryTestUtils;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -28,7 +28,7 @@
/**
* {@link ContextCustomizer} implementation that adds batch test utility classes
- * ({@link JobLauncherTestUtils} and {@link JobRepositoryTestUtils}) as beans in the test
+ * ({@link JobOperatorTestUtils} and {@link JobRepositoryTestUtils}) as beans in the test
* context.
*
* @author Mahmoud Ben Hassine, Alexander Arshavskiy
@@ -36,7 +36,7 @@
*/
public class BatchTestContextCustomizer implements ContextCustomizer {
- private static final String JOB_LAUNCHER_TEST_UTILS_BEAN_NAME = "jobLauncherTestUtils";
+ private static final String JOB_OPERATOR_TEST_UTILS_BEAN_NAME = "jobOperatorTestUtils";
private static final String JOB_REPOSITORY_TEST_UTILS_BEAN_NAME = "jobRepositoryTestUtils";
@@ -53,8 +53,8 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
"The bean factory must be an instance of BeanDefinitionRegistry");
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
- registry.registerBeanDefinition(JOB_LAUNCHER_TEST_UTILS_BEAN_NAME,
- new RootBeanDefinition(JobLauncherTestUtils.class));
+ registry.registerBeanDefinition(JOB_OPERATOR_TEST_UTILS_BEAN_NAME,
+ new RootBeanDefinition(JobOperatorTestUtils.class));
registry.registerBeanDefinition(JOB_REPOSITORY_TEST_UTILS_BEAN_NAME,
new RootBeanDefinition(JobRepositoryTestUtils.class));
registry.registerBeanDefinition(BATCH_TEST_CONTEXT_BEAN_POST_PROCESSOR_BEAN_NAME,
diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/context/SpringBatchTest.java b/spring-batch-test/src/main/java/org/springframework/batch/test/context/SpringBatchTest.java
index a597f95b9b..d12cbf9fc9 100644
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/context/SpringBatchTest.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/context/SpringBatchTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -24,7 +24,7 @@
import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.batch.test.JobRepositoryTestUtils;
import org.springframework.batch.test.JobScopeTestExecutionListener;
import org.springframework.batch.test.StepScopeTestExecutionListener;
@@ -35,8 +35,8 @@
* Annotation that can be specified on a test class that runs Spring Batch based tests.
* Provides the following features over the regular Spring TestContext Framework:
*
- *
Registers a {@link JobLauncherTestUtils} bean named "jobLauncherTestUtils" which
- * can be used in tests for launching jobs and steps.
+ *
Registers a {@link JobOperatorTestUtils} bean named "jobOperatorTestUtils" which
+ * can be used in tests for starting jobs and steps.
*
Registers a {@link JobRepositoryTestUtils} bean named "jobRepositoryTestUtils"
* which can be used in tests setup to create or remove job executions.
*
Registers the {@link StepScopeTestExecutionListener} and
@@ -53,7 +53,7 @@
* public class MyBatchJobTests {
*
* @Autowired
- * private JobLauncherTestUtils jobLauncherTestUtils;
+ * private JobOperatorTestUtils jobOperatorTestUtils;
*
* @Autowired
* private JobRepositoryTestUtils jobRepositoryTestUtils;
@@ -64,16 +64,16 @@
* @Before
* public void setup() {
* this.jobRepositoryTestUtils.removeJobExecutions();
- * this.jobLauncherTestUtils.setJob(this.jobUnderTest); // this is optional if the job is unique
+ * this.jobOperatorTestUtils.setJob(this.jobUnderTest); // this is optional if the job is unique
* }
*
* @Test
* public void testMyJob() throws Exception {
* // given
- * JobParameters jobParameters = this.jobLauncherTestUtils.getUniqueJobParameters();
+ * JobParameters jobParameters = this.jobOperatorTestUtils.getUniqueJobParameters();
*
* // when
- * JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ * JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
*
* // then
* Assert.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -92,24 +92,24 @@
* public class MyBatchJobTests {
*
* @Autowired
- * private JobLauncherTestUtils jobLauncherTestUtils;
+ * private JobOperatorTestUtils jobOperatorTestUtils;
*
* @Autowired
* private JobRepositoryTestUtils jobRepositoryTestUtils;
*
* @BeforeEach
* public void setup(@Autowired Job jobUnderTest) {
- * this.jobLauncherTestUtils.setJob(jobUnderTest); // this is optional if the job is unique
+ * this.jobOperatorTestUtils.setJob(jobUnderTest); // this is optional if the job is unique
* this.jobRepositoryTestUtils.removeJobExecutions();
* }
*
* @Test
* public void testMyJob() throws Exception {
* // given
- * JobParameters jobParameters = this.jobLauncherTestUtils.getUniqueJobParameters();
+ * JobParameters jobParameters = this.jobOperatorTestUtils.getUniqueJobParameters();
*
* // when
- * JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ * JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
*
* // then
* Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -120,7 +120,7 @@
*
* It should be noted that if the test context contains a single job bean definition, that
* is the job under test, then this annotation will set that job in the
- * {@link JobLauncherTestUtils} automatically.
+ * {@link JobOperatorTestUtils} automatically.
*
* The test context must contain a JobRepository and a
* JobLauncher beans for this annotation to properly set up test utilities.
@@ -131,7 +131,7 @@
* @author Mahmoud Ben Hassine
* @author Taeik Lim
* @since 4.1
- * @see JobLauncherTestUtils
+ * @see JobOperatorTestUtils
* @see JobRepositoryTestUtils
* @see StepScopeTestExecutionListener
* @see JobScopeTestExecutionListener
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java
index 0cbc7c2342..715f0ed0ef 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java
@@ -24,7 +24,7 @@
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.test.sample.SampleTasklet;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java
index a823b01c77..906fdbd477 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java
@@ -23,8 +23,8 @@
import java.util.Date;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
class ExecutionContextTestUtilsTests {
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java
index e378cfd92f..2eb32abefb 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java
@@ -18,11 +18,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.launch.JobLauncher;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java
index 3887f71ec1..aabad7826b 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java
@@ -25,9 +25,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java
index d295007f00..6e527486bd 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java
@@ -20,7 +20,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerTests.java
index 61efbf62a8..fa39c9fa94 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerTests.java
@@ -20,8 +20,8 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
import org.springframework.batch.core.scope.context.JobContext;
import org.springframework.batch.core.scope.context.JobSynchronizationManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java
index 2b6412962e..4f466549bd 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java
@@ -20,7 +20,7 @@
import java.util.List;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParameters;
import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.support.PropertiesConverter;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java
index e16e1410a7..0b41737841 100755
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2022 the original author or authors.
+ * Copyright 2008-2025 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.
@@ -15,14 +15,14 @@
*/
package org.springframework.batch.test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.step.Step;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +38,12 @@ class SampleStepTests implements ApplicationContextAware {
@Autowired
private JdbcTemplate jdbcTemplate;
- private StepRunner stepRunner;
+ private JobOperatorTestUtils jobOperatorTestUtils;
private ApplicationContext context;
@Autowired
- private JobLauncher jobLauncher;
+ private JobOperator jobOperator;
@Autowired
private JobRepository jobRepository;
@@ -51,7 +51,7 @@ class SampleStepTests implements ApplicationContextAware {
@BeforeEach
void setUp() {
jdbcTemplate.update("create table TESTS (ID integer, NAME varchar(40))");
- stepRunner = new StepRunner(jobLauncher, jobRepository);
+ jobOperatorTestUtils = new JobOperatorTestUtils(jobOperator, jobRepository);
}
@AfterEach
@@ -61,8 +61,8 @@ void tearDown() {
@Test
void testTasklet() {
- Step step = (Step) context.getBean("s2");
- assertEquals(BatchStatus.COMPLETED, stepRunner.launchStep(step).getStatus());
+ Step step = context.getBean("s2", Step.class);
+ assertEquals(BatchStatus.COMPLETED, jobOperatorTestUtils.startStep(step).getStatus());
assertEquals(2, jdbcTemplate.queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet2'", Integer.class)
.intValue());
}
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java
index dbe3f22da7..9f83750cf2 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -24,9 +24,9 @@
import org.junit.runner.RunWith;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.JobScope;
import org.springframework.batch.core.configuration.annotation.StepScope;
@@ -58,7 +58,7 @@
public class SpringBatchTestJUnit4Tests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
private JobRepositoryTestUtils jobRepositoryTestUtils;
@@ -99,7 +99,7 @@ public void testJobScopedItemReader() throws Exception {
public void testJob() throws Exception {
// when
this.jobRepositoryTestUtils.removeJobExecutions();
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob();
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob();
// then
Assert.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java
index 924779cc11..b901605e11 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -22,10 +22,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.JobScope;
import org.springframework.batch.core.configuration.annotation.StepScope;
@@ -58,7 +58,7 @@
public class SpringBatchTestJUnit5Tests {
@Autowired
- private JobLauncherTestUtils jobLauncherTestUtils;
+ private JobOperatorTestUtils jobOperatorTestUtils;
@Autowired
private JobRepositoryTestUtils jobRepositoryTestUtils;
@@ -87,10 +87,10 @@ void testJobScopedItemReader() throws Exception {
void testJob() throws Exception {
// given
this.jobRepositoryTestUtils.removeJobExecutions();
- JobParameters jobParameters = this.jobLauncherTestUtils.getUniqueJobParameters();
+ JobParameters jobParameters = this.jobOperatorTestUtils.getUniqueJobParameters();
// when
- JobExecution jobExecution = this.jobLauncherTestUtils.launchJob(jobParameters);
+ JobExecution jobExecution = this.jobOperatorTestUtils.startJob(jobParameters);
// then
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java
index b865a7035f..f12cc4bb35 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 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.
@@ -23,16 +23,16 @@
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.annotation.AfterStep;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.builder.StepBuilder;
import org.springframework.batch.item.ItemProcessor;
@@ -54,15 +54,15 @@
class StepScopeAnnotatedListenerIntegrationTests {
@Autowired
- JobLauncherTestUtils jobLauncherTestUtils;
+ JobOperatorTestUtils jobOperatorTestUtils;
@Test
void test(@Autowired Job job) {
// given
- this.jobLauncherTestUtils.setJob(job);
+ this.jobOperatorTestUtils.setJob(job);
// when
- JobExecution jobExecution = jobLauncherTestUtils.launchStep("step-under-test");
+ JobExecution jobExecution = jobOperatorTestUtils.startStep("step-under-test");
// then
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
@@ -102,11 +102,8 @@ static class TestConfig {
private PlatformTransactionManager transactionManager;
@Bean
- JobLauncherTestUtils jobLauncherTestUtils(JobRepository jobRepository, JobLauncher jobLauncher) {
- JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils();
- jobLauncherTestUtils.setJobRepository(jobRepository);
- jobLauncherTestUtils.setJobLauncher(jobLauncher);
- return jobLauncherTestUtils;
+ JobOperatorTestUtils jobOperatorTestUtils(JobRepository jobRepository, JobOperator jobOperator) {
+ return new JobOperatorTestUtils(jobOperator, jobRepository);
}
@Bean
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java
index 4f3ce40652..d37e58a9bf 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java
@@ -19,7 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerTests.java
index 8e176c5fb6..4afcf653e4 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerTests.java
@@ -20,9 +20,9 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.scope.context.StepContext;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java
index 06e225b2e9..0cf7be2c92 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2025 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.
@@ -20,10 +20,10 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -46,7 +46,7 @@ class BatchTestContextBeanPostProcessorTests {
@BeforeEach
void setUp() {
this.applicationContext = new AnnotationConfigApplicationContext(BatchConfiguration.class);
- this.applicationContext.registerBean(JobLauncherTestUtils.class);
+ this.applicationContext.registerBean(JobOperatorTestUtils.class);
}
@AfterEach
@@ -58,25 +58,25 @@ void tearDown() {
@Test
void testContextWithoutJobBean() {
- var jobLauncherTestUtils = this.applicationContext.getBean(JobLauncherTestUtils.class);
- assertNotNull(jobLauncherTestUtils);
- assertNull(jobLauncherTestUtils.getJob());
+ var jobOperatorTestUtils = this.applicationContext.getBean(JobOperatorTestUtils.class);
+ assertNotNull(jobOperatorTestUtils);
+ assertNull(jobOperatorTestUtils.getJob());
}
@Test
void testContextWithUniqueJobBean() {
applicationContext.registerBean(StubJob.class);
- var jobLauncherTestUtils = this.applicationContext.getBean(JobLauncherTestUtils.class);
- assertNotNull(jobLauncherTestUtils.getJob());
+ var jobOperatorTestUtils = this.applicationContext.getBean(JobOperatorTestUtils.class);
+ assertNotNull(jobOperatorTestUtils.getJob());
}
@Test
void testContextWithTwoJobBeans() {
this.applicationContext.registerBean("jobA", StubJob.class);
this.applicationContext.registerBean("jobB", StubJob.class);
- var jobLauncherTestUtils = applicationContext.getBean(JobLauncherTestUtils.class);
- assertNotNull(jobLauncherTestUtils);
- assertNull(jobLauncherTestUtils.getJob());
+ var jobOperatorTestUtils = applicationContext.getBean(JobOperatorTestUtils.class);
+ assertNotNull(jobOperatorTestUtils);
+ assertNull(jobOperatorTestUtils.getJob());
}
static class StubJob implements Job {
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextCustomizerTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextCustomizerTests.java
index efb96008f6..19111e0216 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextCustomizerTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextCustomizerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 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.
@@ -52,7 +52,7 @@ void testCustomizeContext() {
this.contextCustomizer.customizeContext(context, mergedConfig);
// then
- assertTrue(context.containsBean("jobLauncherTestUtils"));
+ assertTrue(context.containsBean("jobOperatorTestUtils"));
assertTrue(context.containsBean("jobRepositoryTestUtils"));
assertTrue(context.containsBean("batchTestContextBeanPostProcessor"));
}
@@ -83,7 +83,7 @@ void testCustomizeContext_whenUsingAotGeneratedArtifactsBatchTestContextIsNotReg
this.contextCustomizer.customizeContext(context, mergedConfig);
// then
- assertFalse(context.containsBean("jobLauncherTestUtils"));
+ assertFalse(context.containsBean("jobOperatorTestUtils"));
assertFalse(context.containsBean("jobRepositoryTestUtils"));
assertFalse(context.containsBean("batchTestContextBeanPostProcessor"));
}
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/context/SpringBatchTestIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/context/SpringBatchTestIntegrationTests.java
index b48c39214d..d4de807f90 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/context/SpringBatchTestIntegrationTests.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/context/SpringBatchTestIntegrationTests.java
@@ -17,10 +17,20 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import org.springframework.batch.test.JobLauncherTestUtils;
+
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.batch.core.launch.support.JobOperatorFactoryBean;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.ResourcelessJobRepository;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
+import org.springframework.batch.test.JobOperatorTestUtils;
import org.springframework.batch.test.JobRepositoryTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -37,7 +47,7 @@ class SpringBatchTestIntegrationTests {
ApplicationContext context;
@Nested
- class InnerWithoutSpringBatchTest {
+ class InnerWithoutSpringBatchTest extends BatchConfiguration {
@Autowired
ApplicationContext context;
@@ -45,7 +55,7 @@ class InnerWithoutSpringBatchTest {
@Test
void test() {
assertSame(SpringBatchTestIntegrationTests.this.context, context);
- assertNotNull(context.getBean(JobLauncherTestUtils.class));
+ assertNotNull(context.getBean(JobOperatorTestUtils.class));
assertNotNull(context.getBean(JobRepositoryTestUtils.class));
}
@@ -53,7 +63,7 @@ void test() {
@Nested
@SpringBatchTest
- class InnerWithSpringBatchTest {
+ class InnerWithSpringBatchTest extends BatchConfiguration {
@Autowired
ApplicationContext context;
@@ -61,10 +71,35 @@ class InnerWithSpringBatchTest {
@Test
void test() {
assertSame(SpringBatchTestIntegrationTests.this.context, context);
- assertNotNull(context.getBean(JobLauncherTestUtils.class));
+ assertNotNull(context.getBean(JobOperatorTestUtils.class));
assertNotNull(context.getBean(JobRepositoryTestUtils.class));
}
}
+ @Configuration
+ static class BatchConfiguration {
+
+ @Bean
+ public JobRepository jobRepository() {
+ return new ResourcelessJobRepository();
+ }
+
+ @Bean
+ public JobRegistry jobRegistry() {
+ return new MapJobRegistry();
+ }
+
+ @Bean
+ public JobOperator jobOperator(JobRepository jobRepository, JobRegistry jobRegistry) throws Exception {
+ JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
+ jobOperatorFactoryBean.setJobRepository(jobRepository);
+ jobOperatorFactoryBean.setJobRegistry(jobRegistry);
+ jobOperatorFactoryBean.setTransactionManager(new ResourcelessTransactionManager());
+ jobOperatorFactoryBean.afterPropertiesSet();
+ return jobOperatorFactoryBean.getObject();
+ }
+
+ }
+
}
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java
index 3e71868131..98f487f666 100755
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java
@@ -17,7 +17,7 @@
package org.springframework.batch.test.jmx;
import org.aspectj.lang.JoinPoint;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java
index a3baab9a1b..dbe8e117b3 100644
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java
@@ -17,7 +17,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.step.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java
index 702c6ac587..595212b7de 100755
--- a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java
+++ b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java
@@ -15,9 +15,9 @@
*/
package org.springframework.batch.test.sample;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.core.step.tasklet.Tasklet;
diff --git a/spring-batch-test/src/test/resources/simple-job-launcher-context.xml b/spring-batch-test/src/test/resources/simple-job-launcher-context.xml
index 237e3aadd9..80e3509026 100755
--- a/spring-batch-test/src/test/resources/simple-job-launcher-context.xml
+++ b/spring-batch-test/src/test/resources/simple-job-launcher-context.xml
@@ -14,8 +14,16 @@
+
+
+
+
+
+
+
+ class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean">