Rename JobRepositoryFactoryBean to JdbcJobRepositoryFactoryBean

Resolves #4829

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java

@@ -26,7 +26,7 @@
 import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.launch.support.JobOperatorFactoryBean;
 import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -92,7 +92,7 @@ private void registerJobRepository(BeanDefinitionRegistry registry, EnableBatchP
 			return;
 		}
 		BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder
-			.genericBeanDefinition(JobRepositoryFactoryBean.class);
+			.genericBeanDefinition(JdbcJobRepositoryFactoryBean.class);
 
 		// set mandatory properties
 		String dataSourceRef = batchAnnotation.dataSourceRef();

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java

@@ -47,7 +47,7 @@
 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.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;
@@ -121,7 +121,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 
 	@Bean
 	public JobRepository jobRepository() throws BatchConfigurationException {
-		JobRepositoryFactoryBean jobRepositoryFactoryBean = new JobRepositoryFactoryBean();
+		JdbcJobRepositoryFactoryBean jobRepositoryFactoryBean = new JdbcJobRepositoryFactoryBean();
 		try {
 			jobRepositoryFactoryBean.setDataSource(getDataSource());
 			jobRepositoryFactoryBean.setTransactionManager(getTransactionManager());

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java

@@ -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

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.
@@ -43,7 +43,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

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JdbcJobRepositoryFactoryBean.java

@@ -0,0 +1,34 @@
+/*
+ * 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.support;
+
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A {@link FactoryBean} that automates the creation of a {@link SimpleJobRepository}
+ * using JDBC DAO implementations which persist batch metadata in a relational database.
+ * Requires the user to describe what kind of database they are using.
+ *
+ * @author Ben Hale
+ * @author Lucas Ward
+ * @author Dave Syer
+ * @author Michael Minella
+ * @author Mahmoud Ben Hassine
+ * @since 6.0
+ */
+public class JdbcJobRepositoryFactoryBean extends JobRepositoryFactoryBean {
+
+}

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java

@@ -72,34 +72,37 @@
  * @author Dave Syer
  * @author Michael Minella
  * @author Mahmoud Ben Hassine
+ * @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 JobRepositoryFactoryBean extends AbstractJobRepositoryFactoryBean implements InitializingBean {
 
 	protected static final Log logger = LogFactory.getLog(JobRepositoryFactoryBean.class);
 
-	private DataSource dataSource;
+	protected DataSource dataSource;
 
-	private JdbcOperations jdbcOperations;
+	protected JdbcOperations jdbcOperations;
 
-	private String databaseType;
+	protected String databaseType;
 
-	private String tablePrefix = AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
+	protected String tablePrefix = AbstractJdbcBatchMetadataDao.DEFAULT_TABLE_PREFIX;
 
-	private DataFieldMaxValueIncrementerFactory incrementerFactory;
+	protected DataFieldMaxValueIncrementerFactory incrementerFactory;
 
-	private JobKeyGenerator jobKeyGenerator;
+	protected JobKeyGenerator jobKeyGenerator;
 
-	private int maxVarCharLengthForExitMessage = AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
+	protected int maxVarCharLengthForExitMessage = AbstractJdbcBatchMetadataDao.DEFAULT_EXIT_MESSAGE_LENGTH;
 
-	private int maxVarCharLengthForShortContext = AbstractJdbcBatchMetadataDao.DEFAULT_SHORT_CONTEXT_LENGTH;
+	protected int maxVarCharLengthForShortContext = AbstractJdbcBatchMetadataDao.DEFAULT_SHORT_CONTEXT_LENGTH;
 
-	private ExecutionContextSerializer serializer;
+	protected ExecutionContextSerializer serializer;
 
-	private Integer clobType;
+	protected Integer clobType;
 
-	private Charset charset = StandardCharsets.UTF_8;
+	protected Charset charset = StandardCharsets.UTF_8;
 
-	private ConfigurableConversionService conversionService;
+	protected ConfigurableConversionService conversionService;
 
 	/**
 	 * @param type a value from the {@link java.sql.Types} class to indicate the type to

spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java

@@ -26,7 +26,7 @@
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.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 +60,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();

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java

@@ -29,7 +29,7 @@
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 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 +55,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();

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java

@@ -48,7 +48,7 @@
 import org.springframework.batch.core.repository.explore.support.JobExplorerFactoryBean;
 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;
@@ -103,7 +103,7 @@ 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();

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java

@@ -28,7 +28,7 @@
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.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 +53,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();