Move conversion service configuration to AbstractJdbcBatchMetadataDao

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java

@@ -18,7 +18,10 @@
 
 import java.sql.Types;
 
+import org.springframework.batch.core.converter.*;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.convert.support.ConfigurableConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -47,6 +50,8 @@ public abstract class AbstractJdbcBatchMetadataDao implements InitializingBean {
 
 	private JdbcOperations jdbcTemplate;
 
+	private ConfigurableConversionService conversionService;
+
 	protected String getQuery(String base) {
 		return StringUtils.replace(base, "%PREFIX%", tablePrefix);
 	}
@@ -80,9 +85,34 @@ public void setClobTypeToUse(int clobTypeToUse) {
 		this.clobTypeToUse = clobTypeToUse;
 	}
 
+	/**
+	 * Set the conversion service to use to convert job parameters from String literals to
+	 * typed values and vice versa.
+	 */
+	public void setConversionService(ConfigurableConversionService conversionService) {
+		Assert.notNull(conversionService, "conversionService must not be null");
+		this.conversionService = conversionService;
+	}
+
+	public ConfigurableConversionService getConversionService() {
+		return conversionService;
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		Assert.state(jdbcTemplate != null, "JdbcOperations is required");
+		if (this.conversionService == null) {
+			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());
+			this.conversionService = conversionService;
+		}
 	}
 
 }

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java

@@ -39,20 +39,10 @@
 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;
-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.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;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.jdbc.core.RowCallbackHandler;
@@ -157,23 +147,8 @@ SELECT COUNT(*)
 
 	private DataFieldMaxValueIncrementer jobExecutionIncrementer;
 
-	private ConfigurableConversionService conversionService;
-
 	private final Lock lock = new ReentrantLock();
 
-	public JdbcJobExecutionDao() {
-		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());
-		this.conversionService = conversionService;
-	}
-
 	/**
 	 * Public setter for the exit message length in database. Do not set this if you
 	 * haven't modified the schema.
@@ -192,15 +167,6 @@ public void setJobExecutionIncrementer(DataFieldMaxValueIncrementer jobExecution
 		this.jobExecutionIncrementer = jobExecutionIncrementer;
 	}
 
-	/**
-	 * Set the conversion service to use to convert job parameters from String literals to
-	 * typed values and vice versa.
-	 */
-	public void setConversionService(@NonNull ConfigurableConversionService conversionService) {
-		Assert.notNull(conversionService, "conversionService must not be null");
-		this.conversionService = conversionService;
-	}
-
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		super.afterPropertiesSet();
@@ -432,7 +398,7 @@ private <T> void insertParameter(PreparedStatement preparedStatement, Long execu
 
 		String identifyingFlag = identifying ? "Y" : "N";
 
-		String stringValue = this.conversionService.convert(value, String.class);
+		String stringValue = getConversionService().convert(value, String.class);
 
 		preparedStatement.setLong(1, executionId);
 		preparedStatement.setString(2, key);
@@ -459,7 +425,7 @@ protected JobParameters getJobParameters(Long executionId) {
 				throw new RuntimeException(e);
 			}
 			String stringValue = rs.getString("PARAMETER_VALUE");
-			Object typedValue = conversionService.convert(stringValue, parameterType);
+			Object typedValue = getConversionService().convert(stringValue, parameterType);
 
 			boolean identifying = rs.getString("IDENTIFYING").equalsIgnoreCase("Y");