Move unused methods in DefaultBatchConfiguration to its subclasses

While this creates some duplication (which can be avoided
by introducing an intermediate base class), it removes the
exposure of methods to clients who do not need/use them.

Author: fmbenhassine

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

@@ -16,10 +16,7 @@
 package org.springframework.batch.core.configuration.support;
 
 import org.springframework.batch.core.configuration.DuplicateJobException;
-import org.springframework.batch.core.job.DefaultJobKeyGenerator;
 import org.springframework.batch.core.job.Job;
-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.DefaultJobParametersConverter;
@@ -39,7 +36,6 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Isolation;
 
 /**
  * Base {@link Configuration} class that provides common infrastructure beans for enabling
@@ -153,33 +149,4 @@ protected JobParametersConverter getJobParametersConverter() {
 		return new DefaultJobParametersConverter();
 	}
 
-	/**
-	 * Return the value of the {@code validateTransactionState} parameter. Defaults to
-	 * {@code true}.
-	 * @return true if the transaction state should be validated, false otherwise
-	 */
-	protected boolean getValidateTransactionState() {
-		return true;
-	}
-
-	/**
-	 * Return the transaction isolation level when creating job executions. Defaults to
-	 * {@link Isolation#SERIALIZABLE}.
-	 * @return the transaction isolation level when creating job executions
-	 */
-	protected Isolation getIsolationLevelForCreate() {
-		return Isolation.SERIALIZABLE;
-	}
-
-	/**
-	 * A custom implementation of the {@link JobKeyGenerator}. The default, if not
-	 * injected, is the {@link DefaultJobKeyGenerator}.
-	 * @return the generator that creates the key used in identifying {@link JobInstance}
-	 * objects
-	 * @since 5.1
-	 */
-	protected JobKeyGenerator getJobKeyGenerator() {
-		return new DefaultJobKeyGenerator();
-	}
-
 }

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

@@ -24,6 +24,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.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobKeyGenerator;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.repository.ExecutionContextSerializer;
 import org.springframework.batch.core.repository.JobRepository;
@@ -45,6 +48,7 @@
 import org.springframework.jdbc.support.MetaDataAccessException;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Isolation;
 
 import javax.sql.DataSource;
 import java.nio.charset.Charset;
@@ -255,4 +259,33 @@ protected ConfigurableConversionService getConversionService() {
 		return conversionService;
 	}
 
+	/**
+	 * Return the value of the {@code validateTransactionState} parameter. Defaults to
+	 * {@code true}.
+	 * @return true if the transaction state should be validated, false otherwise
+	 */
+	protected boolean getValidateTransactionState() {
+		return true;
+	}
+
+	/**
+	 * Return the transaction isolation level when creating job executions. Defaults to
+	 * {@link Isolation#SERIALIZABLE}.
+	 * @return the transaction isolation level when creating job executions
+	 */
+	protected Isolation getIsolationLevelForCreate() {
+		return Isolation.SERIALIZABLE;
+	}
+
+	/**
+	 * A custom implementation of the {@link JobKeyGenerator}. The default, if not
+	 * injected, is the {@link DefaultJobKeyGenerator}.
+	 * @return the generator that creates the key used in identifying {@link JobInstance}
+	 * objects
+	 * @since 5.1
+	 */
+	protected JobKeyGenerator getJobKeyGenerator() {
+		return new DefaultJobKeyGenerator();
+	}
+
 }

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

@@ -16,13 +16,17 @@
 package org.springframework.batch.core.configuration.support;
 
 import org.springframework.batch.core.configuration.BatchConfigurationException;
+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.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;
+import org.springframework.transaction.annotation.Isolation;
 
 /**
  * Base {@link Configuration} class that provides common MongoDB-based infrastructure
@@ -115,4 +119,33 @@ protected MongoTransactionManager getTransactionManager() {
 		return this.applicationContext.getBean("transactionManager", MongoTransactionManager.class);
 	}
 
+	/**
+	 * Return the value of the {@code validateTransactionState} parameter. Defaults to
+	 * {@code true}.
+	 * @return true if the transaction state should be validated, false otherwise
+	 */
+	protected boolean getValidateTransactionState() {
+		return true;
+	}
+
+	/**
+	 * Return the transaction isolation level when creating job executions. Defaults to
+	 * {@link Isolation#SERIALIZABLE}.
+	 * @return the transaction isolation level when creating job executions
+	 */
+	protected Isolation getIsolationLevelForCreate() {
+		return Isolation.SERIALIZABLE;
+	}
+
+	/**
+	 * A custom implementation of the {@link JobKeyGenerator}. The default, if not
+	 * injected, is the {@link DefaultJobKeyGenerator}.
+	 * @return the generator that creates the key used in identifying {@link JobInstance}
+	 * objects
+	 * @since 5.1
+	 */
+	protected JobKeyGenerator getJobKeyGenerator() {
+		return new DefaultJobKeyGenerator();
+	}
+
 }