Skip to content

Commit de567e8

Browse files
committed
Fix JavaBean setter collision
This commit changes the name of the overloaded setter for isolationLevelForCreate to remove ambiguity in setter selection by Spring Framework. Resolves #4213
1 parent 05f6d13 commit de567e8

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public JobRepository jobRepository() throws BatchConfigurationException {
132132
jobRepositoryFactoryBean.setLobHandler(getLobHandler());
133133
jobRepositoryFactoryBean.setCharset(getCharset());
134134
jobRepositoryFactoryBean.setMaxVarCharLength(getMaxVarCharLength());
135-
jobRepositoryFactoryBean.setIsolationLevelForCreate(getIsolationLevelForCreate());
135+
jobRepositoryFactoryBean.setIsolationLevelForCreateEnum(getIsolationLevelForCreate());
136136
jobRepositoryFactoryBean.setValidateTransactionState(getValidateTransactionState());
137137
jobRepositoryFactoryBean.afterPropertiesSet();
138138
return jobRepositoryFactoryBean.getObject();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void setIsolationLevelForCreate(String isolationLevelForCreate) {
144144
* @see SimpleJobRepository#createJobExecution(String,
145145
* org.springframework.batch.core.JobParameters)
146146
*/
147-
public void setIsolationLevelForCreate(Isolation isolationLevelForCreate) {
147+
public void setIsolationLevelForCreateEnum(Isolation isolationLevelForCreate) {
148148
this.setIsolationLevelForCreate(TRANSACTION_ISOLATION_LEVEL_PREFIX + isolationLevelForCreate.name());
149149
}
150150

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void testTransactionAttributesForCreateMethod() throws Exception {
325325
@Test
326326
void testSetTransactionAttributesForCreateMethod() throws Exception {
327327

328-
factory.setIsolationLevelForCreate(Isolation.READ_UNCOMMITTED);
328+
factory.setIsolationLevelForCreateEnum(Isolation.READ_UNCOMMITTED);
329329
testCreateRepository();
330330
JobRepository repository = factory.getObject();
331331
DefaultTransactionDefinition transactionDefinition = new DefaultTransactionDefinition(

spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public JobRepository jobRepository(DataSource dataSource, PlatformTransactionMan
163163
throws Exception {
164164
JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
165165
factory.setDataSource(dataSource);
166-
factory.setIsolationLevelForCreate(Isolation.READ_COMMITTED);
166+
factory.setIsolationLevelForCreateEnum(Isolation.READ_COMMITTED);
167167
factory.setTransactionManager(transactionManager);
168168
factory.afterPropertiesSet();
169169
return factory.getObject();

0 commit comments

Comments
 (0)