Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - BATCH-595: Incorrect JDBC type for job parameters of long type

Browse Source 
used Types.BIGINT instead of Types.INTEGER for Long values
This commit is contained in:
robokaso
2008-04-22 11:24:49 +00:00
parent 1c8df0d5f5
commit 75111fbe01
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
View File

@@ -136,8 +136,8 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements
private void insertParameter(Long jobId, ParameterType type, String key, Object value) { private void insertParameter(Long jobId, ParameterType type, String key, Object value) {
Object[] args = new Object[0]; Object[] args = new Object[0];
int[] argTypes = new int[] { Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP, int[] argTypes = new int[] { Types.BIGINT, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP,
Types.INTEGER, Types.DOUBLE }; Types.BIGINT, Types.DOUBLE };
if (type == ParameterType.STRING) { if (type == ParameterType.STRING) {
args = new Object[] { jobId, key, type, value, new Timestamp(0L), new Long(0), new Double(0) }; args = new Object[] { jobId, key, type, value, new Timestamp(0L), new Long(0), new Double(0) };

23
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobInstanceDaoTests.java
View File

@@ -1,5 +1,7 @@
package org.springframework.batch.core.repository.dao; package org.springframework.batch.core.repository.dao;
import java.util.Date;
import org.springframework.batch.core.Job; import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParameters;
@@ -9,14 +11,18 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
public abstract class AbstractJobInstanceDaoTests extends AbstractTransactionalDataSourceSpringContextTests { public abstract class AbstractJobInstanceDaoTests extends AbstractTransactionalDataSourceSpringContextTests {
private static final long DATE = 777;
private JobInstanceDao dao = new MapJobInstanceDao(); private JobInstanceDao dao = new MapJobInstanceDao();
private Job fooJob = new JobSupport("foo"); private Job fooJob = new JobSupport("foo");
private JobParameters fooParams = new JobParametersBuilder().addString("fooKey", "fooValue").toJobParameters(); private JobParameters fooParams = new JobParametersBuilder().addString("stringKey", "stringValue").addLong(
"longKey", new Long(Long.MAX_VALUE)).addDouble("doubleKey", new Double(Double.MAX_VALUE)).addDate(
"dateKey", new Date(DATE)).toJobParameters();
protected abstract JobInstanceDao getJobInstanceDao(); protected abstract JobInstanceDao getJobInstanceDao();
protected void onSetUp() throws Exception { protected void onSetUp() throws Exception {
dao = getJobInstanceDao(); dao = getJobInstanceDao();
} }
@@ -32,7 +38,15 @@ public abstract class AbstractJobInstanceDaoTests extends AbstractTransactionalD
assertEquals(fooParams, fooInstance.getJobParameters()); assertEquals(fooParams, fooInstance.getJobParameters());
JobInstance retrievedInstance = dao.getJobInstance(fooJob, fooParams); JobInstance retrievedInstance = dao.getJobInstance(fooJob, fooParams);
JobParameters retrievedParams = retrievedInstance.getJobParameters();
assertEquals(fooInstance, retrievedInstance); assertEquals(fooInstance, retrievedInstance);
assertEquals(fooJob, retrievedInstance.getJob());
assertEquals(fooParams, retrievedParams);
assertEquals(Long.MAX_VALUE, retrievedParams.getLong("longKey").longValue());
assertEquals(Double.MAX_VALUE, retrievedParams.getDouble("doubleKey").doubleValue(), 0.001);
assertEquals("stringValue", retrievedParams.getString("stringKey"));
assertEquals(new Date(DATE), retrievedParams.getDate("dateKey"));
} }
/** /**
@@ -52,13 +66,14 @@ public abstract class AbstractJobInstanceDaoTests extends AbstractTransactionalD
} }
public void testCreationAddsVersion() { public void testCreationAddsVersion() {
JobInstance jobInstance = new JobInstance(new Long(1), new JobParameters(), new JobSupport("testVersionAndId")); JobInstance jobInstance = new JobInstance(new Long(1), new JobParameters(), new JobSupport("testVersionAndId"));
assertNull(jobInstance.getVersion()); assertNull(jobInstance.getVersion());
jobInstance = dao.createJobInstance(new JobSupport("testVersion"), new JobParameters()); jobInstance = dao.createJobInstance(new JobSupport("testVersion"), new JobParameters());
assertNotNull(jobInstance.getVersion()); assertNotNull(jobInstance.getVersion());
} }
} }