Change the return type of counting methods in various DAOs from int to long

This is required for job repository/explorer implementations
that use the Long type to count records in the database.

Resolves #4227

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java

@@ -153,6 +153,6 @@ default JobExecution getLastJobExecution(JobInstance jobInstance) {
 	 * @throws NoSuchJobException thrown when there is no {@link JobInstance} for the
 	 * jobName specified.
 	 */
-	int getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException;
+	long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException;
 
 }

spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java

@@ -226,7 +226,7 @@ public List<String> getJobNames() {
 	 * String)
 	 */
 	@Override
-	public int getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
+	public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
 		return jobInstanceDao.getJobInstanceCount(jobName);
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 the original author or authors.
+ * Copyright 2006-2022 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.
@@ -84,7 +84,7 @@ public String executeStep(Step step)
 	}
 
 	private boolean isStepRestart(Step step) {
-		int count = jobRepository.getStepExecutionCount(execution.getJobInstance(), step.getName());
+		long count = jobRepository.getStepExecutionCount(execution.getJobInstance(), step.getName());
 
 		return count > 0;
 	}

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

@@ -199,7 +199,7 @@ JobExecution createJobExecution(String jobName, JobParameters jobParameters)
 	 * @param stepName the name of the step execution that might have run.
 	 * @return the execution count of the step within the given job instance.
 	 */
-	int getStepExecutionCount(JobInstance jobInstance, String stepName);
+	long getStepExecutionCount(JobInstance jobInstance, String stepName);
 
 	/**
 	 * @param jobName the name of the job that might have run

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

@@ -268,10 +268,10 @@ public JobInstance getJobInstance(JobExecution jobExecution) {
 	 * java.lang.String)
 	 */
 	@Override
-	public int getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
+	public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException {
 
 		try {
-			return getJdbcTemplate().queryForObject(getQuery(COUNT_JOBS_WITH_NAME), Integer.class, jobName);
+			return getJdbcTemplate().queryForObject(getQuery(COUNT_JOBS_WITH_NAME), Long.class, jobName);
 		}
 		catch (EmptyResultDataAccessException e) {
 			throw new NoSuchJobException("No job instances were found for job name " + jobName);

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

@@ -358,8 +358,8 @@ public void addStepExecutions(JobExecution jobExecution) {
 	}
 
 	@Override
-	public int countStepExecutions(JobInstance jobInstance, String stepName) {
-		return getJdbcTemplate().queryForObject(getQuery(COUNT_STEP_EXECUTIONS), Integer.class,
+	public long countStepExecutions(JobInstance jobInstance, String stepName) {
+		return getJdbcTemplate().queryForObject(getQuery(COUNT_STEP_EXECUTIONS), Long.class,
 				jobInstance.getInstanceId(), stepName);
 	}
 

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

@@ -128,7 +128,7 @@ default JobInstance getLastJobInstance(String jobName) {
 	 * repository
 	 * @throws NoSuchJobException thrown if no Job has the jobName specified.
 	 */
-	int getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException;
+	long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobException;
 
 	/**
 	 * Delete the job instance.

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

@@ -87,7 +87,7 @@ default StepExecution getLastStepExecution(JobInstance jobInstance, String stepN
 	 * @since 4.3
 	 * @return the count of {@link StepExecution}s for a given step
 	 */
-	default int countStepExecutions(JobInstance jobInstance, String stepName) {
+	default long countStepExecutions(JobInstance jobInstance, String stepName) {
 		throw new UnsupportedOperationException();
 	}
 

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

@@ -242,7 +242,7 @@ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepNa
 	 * @return number of executions of the step within given job instance
 	 */
 	@Override
-	public int getStepExecutionCount(JobInstance jobInstance, String stepName) {
+	public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
 		return stepExecutionDao.countStepExecutions(jobInstance, stepName);
 	}
 

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2022 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.
@@ -70,7 +70,7 @@ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepNa
 	}
 
 	@Override
-	public int getStepExecutionCount(JobInstance jobInstance, String stepName) {
+	public long getStepExecutionCount(JobInstance jobInstance, String stepName) {
 		return 0;
 	}