Remove deprecated APIs

Resolves #3836

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2020 the original author or authors.
+ * Copyright 2006-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.
@@ -250,22 +250,6 @@ public boolean isStopping() {
 		return status == BatchStatus.STOPPING;
 	}
 
-	/**
-	 * Signal the {@link JobExecution} to stop. Iterates through the associated
-	 * {@link StepExecution}s, calling {@link StepExecution#setTerminateOnly()}.
-	 *
-	 * @deprecated Use {@link org.springframework.batch.core.launch.JobOperator#stop(long)}
-	 * or {@link org.springframework.batch.core.launch.support.CommandLineJobRunner}
-	 * with the "-stop" option instead.
-	 */
-	@Deprecated
-	public void stop() {
-		for (StepExecution stepExecution : stepExecutions) {
-			stepExecution.setTerminateOnly();
-		}
-		status = BatchStatus.STOPPING;
-	}
-
 	/**
 	 * Sets the {@link ExecutionContext} for this execution
 	 *

spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java

@@ -70,27 +70,6 @@ public Long getLong(String key){
 		return value==null ? null : ((Long)value).longValue();
 	}
 
-	/**
-	 * Typesafe Getter for the Long represented by the provided key.  If the
-	 * key does not exist, the default value will be returned.
-	 * 
-	 * @param key to return the value for
-	 * @param defaultValue to return if the value doesn't exist
-	 * @return the parameter represented by the provided key, defaultValue
-	 * otherwise.
-	 * @deprecated Use {@link JobParameters#getLong(java.lang.String, java.lang.Long)}
-	 * instead. This method will be removed in a future release.
-	 */
-	@Deprecated
-	public Long getLong(String key, long defaultValue){
-		if(parameters.containsKey(key)){
-			return getLong(key);
-		}
-		else{
-			return defaultValue;
-		}
-	}
-
 	/**
 	 * Typesafe Getter for the Long represented by the provided key.  If the
 	 * key does not exist, the default value will be returned.
@@ -156,27 +135,6 @@ public Double getDouble(String key){
 		return value==null ? null : value.doubleValue();
 	}
 
-	/**
-	 * Typesafe Getter for the Double represented by the provided key.  If the
-	 * key does not exist, the default value will be returned.
-	 * 
-	 * @param key to return the value for
-	 * @param defaultValue to return if the value doesn't exist
-	 * @return the parameter represented by the provided key, defaultValue
-	 * otherwise.
-	 * @deprecated Use {@link JobParameters#getDouble(java.lang.String, java.lang.Double)}
-	 * instead. This method will be removed in a future release.
-	 */
-	@Deprecated
-	public Double getDouble(String key, double defaultValue){
-		if(parameters.containsKey(key)){
-			return getDouble(key);
-		}
-		else{
-			return defaultValue;
-		}
-	}
-
 	/**
 	 * Typesafe Getter for the Double represented by the provided key.  If the
 	 * key does not exist, the default value will be returned.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 the original author or authors.
+ * Copyright 2006-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.
@@ -84,26 +84,6 @@ public SimpleStepExecutionSplitter(JobRepository jobRepository, boolean allowSta
 		this.stepName = stepName;
 	}
 
-	/**
-	 * Construct a {@link SimpleStepExecutionSplitter} from its mandatory
-	 * properties.
-	 *
-	 * @param jobRepository the {@link JobRepository}
-	 * @param step the target step (a local version of it), used to extract the
-	 * name and allowStartIfComplete flags
-	 * @param partitioner a {@link Partitioner} to use for generating input
-	 * parameters
-	 *
-	 * @deprecated use {@link #SimpleStepExecutionSplitter(JobRepository, boolean, String, Partitioner)} instead
-	 */
-	@Deprecated
-	public SimpleStepExecutionSplitter(JobRepository jobRepository, Step step, Partitioner partitioner) {
-		this.jobRepository = jobRepository;
-		this.allowStartIfComplete = step.isAllowStartIfComplete();
-		this.partitioner = partitioner;
-		this.stepName = step.getName();
-	}
-
 	/**
 	 * Check mandatory properties (step name, job repository and partitioner).
 	 *
@@ -247,22 +227,6 @@ private Map<String, ExecutionContext> getContexts(StepExecution stepExecution, i
 	 * @throws JobExecutionException if unable to check if the step execution is startable
 	 */
 	protected boolean isStartable(StepExecution stepExecution, ExecutionContext context) throws JobExecutionException {
-		return getStartable(stepExecution, context);
-	}
-
-	/**
-	 * Check if a step execution is startable.
-	 * @param stepExecution the step execution to check
-	 * @param context the execution context of the step
-	 * @return true if the step execution is startable, false otherwise
-	 * @throws JobExecutionException if unable to check if the step execution is startable
-	 * @deprecated This method is deprecated in favor of
-	 * {@link SimpleStepExecutionSplitter#isStartable} and will be removed in a
-	 * future version.
-	 */
-	@Deprecated
-	protected boolean getStartable(StepExecution stepExecution, ExecutionContext context) throws JobExecutionException {
-
 		JobInstance jobInstance = stepExecution.getJobExecution().getJobInstance();
 		String stepName = stepExecution.getStepName();
 		StepExecution lastStepExecution = jobRepository.getLastStepExecution(jobInstance, stepName);