From c52e7d0aba1295d31da88afe68bdd554a2a0fea0 Mon Sep 17 00:00:00 2001 From: dsyer Date: Sat, 28 Jun 2008 08:17:49 +0000 Subject: [PATCH] Change incrementer column name as suggested by Thmoas --- ...ltDataFieldMaxValueIncrementerFactory.java | 22 +++++++++---------- ...aFieldMaxValueIncrementerFactoryTests.java | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java index 539e08d10..6524a3cab 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java @@ -59,18 +59,18 @@ public class DefaultDataFieldMaxValueIncrementerFactory implements DataFieldMaxV private DataSource dataSource; - private String primaryKeyColumnName = "id"; + private String incrementerColumnName = "id"; /** - * Public setter for the primary key column name (defaults to "id"). Only - * used by some platforms (Derby, HSQL, MySQL), and should be fine for use - * with Spring Batch meta data as long as the default batch schema hasn't - * been changed. + * Public setter for the column name (defaults to "id") in the incrementer. + * Only used by some platforms (Derby, HSQL, MySQL), and should be fine for + * use with Spring Batch meta data as long as the default batch schema + * hasn't been changed. * - * @param primaryKeyColumnName the primary key column name to set + * @param incrementerColumnName the primary key column name to set */ - public void setPrimaryKeyColumnName(String primaryKeyColumnName) { - this.primaryKeyColumnName = primaryKeyColumnName; + public void setIncrementerColumnName(String incrementerColumnName) { + this.incrementerColumnName = incrementerColumnName; } public DefaultDataFieldMaxValueIncrementerFactory(DataSource dataSource) { @@ -82,13 +82,13 @@ public class DefaultDataFieldMaxValueIncrementerFactory implements DataFieldMaxV return new DB2SequenceMaxValueIncrementer(dataSource, incrementerName); } else if (DB_TYPE_DERBY.equals(incrementerType)) { - return new DerbyMaxValueIncrementer(dataSource, incrementerName, primaryKeyColumnName); + return new DerbyMaxValueIncrementer(dataSource, incrementerName, incrementerColumnName); } else if (DB_TYPE_HSQL.equals(incrementerType)) { - return new HsqlMaxValueIncrementer(dataSource, incrementerName, primaryKeyColumnName); + return new HsqlMaxValueIncrementer(dataSource, incrementerName, incrementerColumnName); } else if (DB_TYPE_MYSQL.equals(incrementerType)) { - return new MySQLMaxValueIncrementer(dataSource, incrementerName, primaryKeyColumnName); + return new MySQLMaxValueIncrementer(dataSource, incrementerName, incrementerColumnName); } else if (DB_TYPE_ORACLE.equals(incrementerType)) { return new OracleSequenceMaxValueIncrementer(dataSource, incrementerName); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java index 1cb294d34..9ae585c29 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java @@ -20,7 +20,6 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory; import org.springframework.jdbc.support.incrementer.DB2SequenceMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer; @@ -34,7 +33,7 @@ import org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIn */ public class DefaultDataFieldMaxValueIncrementerFactoryTests extends TestCase { - DataFieldMaxValueIncrementerFactory factory; + private DefaultDataFieldMaxValueIncrementerFactory factory; /* (non-Javadoc) * @see junit.framework.TestCase#setUp() @@ -88,6 +87,7 @@ public class DefaultDataFieldMaxValueIncrementerFactoryTests extends TestCase { } public void testOracle(){ + factory.setIncrementerColumnName("ID"); assertTrue(factory.getIncrementer("oracle", "NAME") instanceof OracleSequenceMaxValueIncrementer); }