From ba0900127de03943b0d2236cfc0d364b3b162e23 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Fri, 10 Sep 2021 10:39:46 +0200 Subject: [PATCH] Refine contribution #3933 * Remove usage of the newly deprecated method * Rename fields/variables/parameters to be more explicit --- .../support/JobExplorerFactoryBean.java | 4 ++-- .../repository/dao/JdbcJobInstanceDao.java | 22 +++++++++---------- .../support/JobRepositoryFactoryBean.java | 3 ++- .../repository/dao/data-source-context.xml | 2 +- .../core/repository/dao/sql-dao-test.xml | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java index 759ae1751..6049dfe64 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -153,7 +153,7 @@ implements InitializingBean { protected JobInstanceDao createJobInstanceDao() throws Exception { JdbcJobInstanceDao dao = new JdbcJobInstanceDao(); dao.setJdbcTemplate(jdbcOperations); - dao.setJobIncrementer(incrementer); + dao.setJobInstanceIncrementer(incrementer); dao.setTablePrefix(tablePrefix); dao.afterPropertiesSet(); return dao; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java index 8781ea0c4..426119743 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java @@ -88,13 +88,13 @@ JobInstanceDao, InitializingBean { private static final String FIND_LAST_JOBS_LIKE_NAME = "SELECT JOB_INSTANCE_ID, JOB_NAME from %PREFIX%JOB_INSTANCE where JOB_NAME like ? order by JOB_INSTANCE_ID desc"; - private DataFieldMaxValueIncrementer jobIncrementer; + private DataFieldMaxValueIncrementer jobInstanceIncrementer; private JobKeyGenerator jobKeyGenerator = new DefaultJobKeyGenerator(); /** - * In this JDBC implementation a job id is obtained by asking the - * jobIncrementer (which is likely a sequence) for the next long value, and + * In this JDBC implementation a job instance id is obtained by asking the + * jobInstanceIncrementer (which is likely a sequence) for the next long value, and * then passing the Id and parameter values into an INSERT statement. * * @see JobInstanceDao#createJobInstance(String, JobParameters) @@ -111,12 +111,12 @@ JobInstanceDao, InitializingBean { Assert.state(getJobInstance(jobName, jobParameters) == null, "JobInstance must not already exist"); - Long jobId = jobIncrementer.nextLongValue(); + Long jobInstanceId = jobInstanceIncrementer.nextLongValue(); - JobInstance jobInstance = new JobInstance(jobId, jobName); + JobInstance jobInstance = new JobInstance(jobInstanceId, jobName); jobInstance.incrementVersion(); - Object[] parameters = new Object[] { jobId, jobName, + Object[] parameters = new Object[] { jobInstanceId, jobName, jobKeyGenerator.generateKey(jobParameters), jobInstance.getVersion() }; getJdbcTemplate().update( getQuery(CREATE_JOB_INSTANCE), @@ -307,25 +307,25 @@ JobInstanceDao, InitializingBean { */ @Deprecated public void setJobIncrementer(DataFieldMaxValueIncrementer jobIncrementer) { - this.jobIncrementer = jobIncrementer; + this.setJobInstanceIncrementer(jobIncrementer); } /** * Setter for {@link DataFieldMaxValueIncrementer} to be used when * generating primary keys for {@link JobInstance} instances. * - * @param jobIncrementer the {@link DataFieldMaxValueIncrementer} + * @param jobInstanceIncrementer the {@link DataFieldMaxValueIncrementer} * * @since 5.0 */ - public void setJobInstanceIncrementer(DataFieldMaxValueIncrementer jobIncrementer) { - this.jobIncrementer = jobIncrementer; + public void setJobInstanceIncrementer(DataFieldMaxValueIncrementer jobInstanceIncrementer) { + this.jobInstanceIncrementer = jobInstanceIncrementer; } @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - Assert.notNull(jobIncrementer, "JobIncrementer is required"); + Assert.notNull(jobInstanceIncrementer, "jobInstanceIncrementer is required"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java index 763e7c819..4e11e4c73 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java @@ -58,6 +58,7 @@ import static org.springframework.batch.support.DatabaseType.SYBASE; * @author Lucas Ward * @author Dave Syer * @author Michael Minella + * @author Mahmoud Ben Hassine */ public class JobRepositoryFactoryBean extends AbstractJobRepositoryFactoryBean implements InitializingBean { @@ -211,7 +212,7 @@ public class JobRepositoryFactoryBean extends AbstractJobRepositoryFactoryBean i protected JobInstanceDao createJobInstanceDao() throws Exception { JdbcJobInstanceDao dao = new JdbcJobInstanceDao(); dao.setJdbcTemplate(jdbcOperations); - dao.setJobIncrementer(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ")); + dao.setJobInstanceIncrementer(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ")); dao.setTablePrefix(tablePrefix); dao.afterPropertiesSet(); return dao; diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml index 1bd00d117..16dded31d 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml @@ -25,7 +25,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml index 93b2ba182..a86fad53e 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml @@ -18,7 +18,7 @@ - +