Remove JSR-352 implementation

Resolves #3894

Author: fmbenhassine

.gitignore

@@ -25,5 +25,4 @@ build
 out
 
 /.gradletasknamecache
-/spring-batch-jsr352-tck/jsr352-tck-1.0/results/
 **/*.flattened-pom.xml

pom.xml

@@ -18,7 +18,6 @@
 		<module>spring-batch-test</module>
 		<module>spring-batch-integration</module>
 		<module>spring-batch-samples</module>
-		<module>spring-batch-jsr352-tck</module>
 		<module>spring-batch-docs</module>
 	</modules>
 
@@ -72,7 +71,6 @@
 		<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
 		<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
 		<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
-		<jakarta.batch-api.version>2.0.0</jakarta.batch-api.version>
 		<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
 		<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
 		<neo4j-ogm-core.version>3.2.21</neo4j-ogm-core.version>
@@ -111,7 +109,6 @@
 		<sqlserver.version>9.2.1.jre8</sqlserver.version>
 		<jtds.version>1.3.1</jtds.version>
 		<testcontainers.version>1.16.2</testcontainers.version>
-		<com.ibm.jbatch-tck-spi.version>1.0</com.ibm.jbatch-tck-spi.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
 
 		<!-- samples dependencies -->

spring-batch-core/pom.xml

@@ -50,11 +50,6 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-		    <groupId>jakarta.batch</groupId>
-		    <artifactId>jakarta.batch-api</artifactId>
-			<version>${jakarta.batch-api.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>
@@ -256,12 +251,6 @@
 			<version>${jaxb-core.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.ibm.jbatch</groupId>
-			<artifactId>com.ibm.jbatch-tck-spi</artifactId>
-			<version>${com.ibm.jbatch-tck-spi.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.inject</groupId>
 			<artifactId>jakarta.inject-api</artifactId>

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

@@ -108,29 +108,6 @@ public boolean isLessThanOrEqualTo(BatchStatus other) {
 		return this.compareTo(other) <= 0;
 	}
 
-	/**
-	 * Converts the current status to the JSR-352 equivalent
-	 * 
-	 * @return JSR-352 equivalent to the current status
-	 */
-	public jakarta.batch.runtime.BatchStatus getBatchStatus() {
-		if(this == ABANDONED) {
-			return jakarta.batch.runtime.BatchStatus.ABANDONED;
-		} else if(this == COMPLETED) {
-			return jakarta.batch.runtime.BatchStatus.COMPLETED;
-		} else if(this == STARTED) {
-			return jakarta.batch.runtime.BatchStatus.STARTED;
-		} else if(this == STARTING) {
-			return jakarta.batch.runtime.BatchStatus.STARTING;
-		} else if(this == STOPPED) {
-			return jakarta.batch.runtime.BatchStatus.STOPPED;
-		} else if(this == STOPPING) {
-			return jakarta.batch.runtime.BatchStatus.STOPPING;
-		} else {
-			return jakarta.batch.runtime.BatchStatus.FAILED;
-		}
-	}
-
 	/**
 	 * Find a BatchStatus that matches the beginning of the given value. If no
 	 * match is found, return COMPLETED as the default because has is low

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

@@ -65,8 +65,6 @@ public class JobExecution extends Entity {
 
 	private transient volatile List<Throwable> failureExceptions = new CopyOnWriteArrayList<>();
 
-	private final String jobConfigurationName;
-
 	public JobExecution(JobExecution original) {
 		this.jobParameters = original.getJobParameters();
 		this.jobInstance = original.getJobInstance();
@@ -79,7 +77,6 @@ public JobExecution(JobExecution original) {
 		this.exitStatus = original.getExitStatus();
 		this.executionContext = original.getExecutionContext();
 		this.failureExceptions = original.getFailureExceptions();
-		this.jobConfigurationName = original.getJobConfigurationName();
 		this.setId(original.getId());
 		this.setVersion(original.getVersion());
 	}
@@ -91,22 +88,11 @@ public JobExecution(JobExecution original) {
 	 * @param job the job of which this execution is a part
 	 * @param id {@link Long} that represents the id for the JobExecution.
 	 * @param jobParameters {@link JobParameters} instance for this JobExecution.
-	 * @param jobConfigurationName {@link String} instance that represents the
-	 * job configuration name (used with JSR-352).
 	 */
-	public JobExecution(JobInstance job, Long id, @Nullable JobParameters jobParameters, String jobConfigurationName) {
+	public JobExecution(JobInstance job, Long id, @Nullable JobParameters jobParameters) {
 		super(id);
 		this.jobInstance = job;
 		this.jobParameters = jobParameters == null ? new JobParameters() : jobParameters;
-		this.jobConfigurationName = jobConfigurationName;
-	}
-
-	public JobExecution(JobInstance job, JobParameters jobParameters, String jobConfigurationName) {
-		this(job, null, jobParameters, jobConfigurationName);
-	}
-
-	public JobExecution(Long id, JobParameters jobParameters, String jobConfigurationName) {
-		this(null, id, jobParameters, jobConfigurationName);
 	}
 
 	/**
@@ -116,15 +102,15 @@ public JobExecution(Long id, JobParameters jobParameters, String jobConfiguratio
 	 * @param jobParameters {@link JobParameters} instance for this JobExecution.
 	 */
 	public JobExecution(JobInstance job, JobParameters jobParameters) {
-		this(job, null, jobParameters, null);
+		this(job, null, jobParameters);
 	}
 
 	public JobExecution(Long id, JobParameters jobParameters) {
-		this(null, id, jobParameters, null);
+		this(null, id, jobParameters);
 	}
 
 	public JobExecution(Long id) {
-		this(null, id, null, null);
+		this(null, id, null);
 	}
 
 	public JobParameters getJobParameters() {
@@ -283,10 +269,6 @@ public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
-	public String getJobConfigurationName() {
-		return this.jobConfigurationName;
-	}
-
 	/**
 	 * Package private method for re-constituting the step executions from
 	 * existing instances.

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

@@ -30,7 +30,6 @@
  * @see Job
  * @see JobParameters
  * @see JobExecution
- * @see jakarta.batch.runtime.JobInstance
  *
  * @author Lucas Ward
  * @author Dave Syer
@@ -40,7 +39,7 @@
  *
  */
 @SuppressWarnings("serial")
-public class JobInstance extends Entity implements jakarta.batch.runtime.JobInstance{
+public class JobInstance extends Entity {
 
 	private final String jobName;
 
@@ -53,7 +52,6 @@ public JobInstance(Long id, String jobName) {
 	/**
 	 * @return the job name. (Equivalent to getJob().getName())
 	 */
-	@Override
 	public String getJobName() {
 		return jobName;
 	}
@@ -63,7 +61,6 @@ public String toString() {
 		return super.toString() + ", Job=[" + jobName + "]";
 	}
 
-	@Override
 	public long getInstanceId() {
 		return super.getId();
 	}

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java

@@ -25,13 +25,6 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
-import jakarta.batch.api.chunk.listener.RetryProcessListener;
-import jakarta.batch.api.chunk.listener.RetryReadListener;
-import jakarta.batch.api.chunk.listener.RetryWriteListener;
-import jakarta.batch.api.chunk.listener.SkipProcessListener;
-import jakarta.batch.api.chunk.listener.SkipReadListener;
-import jakarta.batch.api.chunk.listener.SkipWriteListener;
-import jakarta.batch.api.partition.PartitionCollector;
 
 import org.springframework.batch.core.ChunkListener;
 import org.springframework.batch.core.ItemProcessListener;
@@ -43,16 +36,6 @@
 import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.job.flow.Flow;
-import org.springframework.batch.core.jsr.ChunkListenerAdapter;
-import org.springframework.batch.core.jsr.ItemProcessListenerAdapter;
-import org.springframework.batch.core.jsr.ItemReadListenerAdapter;
-import org.springframework.batch.core.jsr.ItemWriteListenerAdapter;
-import org.springframework.batch.core.jsr.RetryProcessListenerAdapter;
-import org.springframework.batch.core.jsr.RetryReadListenerAdapter;
-import org.springframework.batch.core.jsr.RetryWriteListenerAdapter;
-import org.springframework.batch.core.jsr.SkipListenerAdapter;
-import org.springframework.batch.core.jsr.StepListenerAdapter;
-import org.springframework.batch.core.jsr.partition.PartitionCollectorAdapter;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.partition.PartitionHandler;
 import org.springframework.batch.core.partition.support.Partitioner;
@@ -105,6 +88,7 @@
  * @author Josh Long
  * @author Michael Minella
  * @author Chris Schaefer
+ * @author Mahmoud Ben Hassine
  * @see SimpleStepFactoryBean
  * @see FaultTolerantStepFactoryBean
  * @see TaskletStep
@@ -159,10 +143,6 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
 
 	private int gridSize = DEFAULT_GRID_SIZE;
 
-	private Queue<Serializable> partitionQueue;
-
-	private ReentrantLock partitionLock;
-
 	//
 	// Tasklet Elements
 	//
@@ -232,31 +212,13 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
 
 	private Set<SkipListener<I, O>> skipListeners = new LinkedHashSet<>();
 
-	private Set<org.springframework.batch.core.jsr.RetryListener> jsrRetryListeners = new LinkedHashSet<>();
-
 	//
 	// Additional
 	//
 	private boolean hasChunkElement = false;
 
 	private StepExecutionAggregator stepExecutionAggregator;
 
-	/**
-	 * @param queue The {@link Queue} that is used for communication between {@link jakarta.batch.api.partition.PartitionCollector} and {@link jakarta.batch.api.partition.PartitionAnalyzer}
-	 */
-	public void setPartitionQueue(Queue<Serializable> queue) {
-		this.partitionQueue = queue;
-	}
-
-	/**
-	 * Used to coordinate access to the partition queue between the {@link jakarta.batch.api.partition.PartitionCollector} and {@link jakarta.batch.api.partition.AbstractPartitionAnalyzer}
-	 *
-	 * @param lock a lock that will be locked around accessing the partition queue
-	 */
-	public void setPartitionLock(ReentrantLock lock) {
-		this.partitionLock = lock;
-	}
-
 	/**
 	 * Create a {@link Step} from the configuration provided.
 	 *
@@ -312,8 +274,6 @@ protected void enhanceCommonStep(StepBuilderHelper<?> builder) {
 		for (Object listener : stepExecutionListeners) {
 			if(listener instanceof StepExecutionListener) {
 				builder.listener((StepExecutionListener) listener);
-			} else if(listener instanceof jakarta.batch.api.listener.StepListener) {
-				builder.listener(new StepListenerAdapter((jakarta.batch.api.listener.StepListener) listener));
 			}
 		}
 	}
@@ -369,10 +329,6 @@ protected Step createFaultTolerantStep() {
 			builder.listener(listener);
 		}
 
-		for (org.springframework.batch.core.jsr.RetryListener listener : jsrRetryListeners) {
-			builder.listener(listener);
-		}
-
 		registerItemListeners(builder);
 
 		if (skipPolicy != null) {
@@ -485,10 +441,6 @@ protected void enhanceTaskletStepBuilder(AbstractTaskletStepBuilder<?> builder)
 
 		enhanceCommonStep(builder);
 		for (ChunkListener listener : chunkListeners) {
-			if(listener instanceof PartitionCollectorAdapter) {
-				((PartitionCollectorAdapter) listener).setPartitionLock(partitionLock);
-			}
-
 			builder.listener(listener);
 
 		}
@@ -817,71 +769,26 @@ public void setListeners(Object[] listeners) {
 				SkipListener<I, O> skipListener = (SkipListener<I, O>) listener;
 				skipListeners.add(skipListener);
 			}
-			if(listener instanceof SkipReadListener) {
-				SkipListener<I, O> skipListener = new SkipListenerAdapter<>((SkipReadListener) listener, null, null);
-				skipListeners.add(skipListener);
-			}
-			if(listener instanceof SkipProcessListener) {
-				SkipListener<I, O> skipListener = new SkipListenerAdapter<>(null, (SkipProcessListener) listener, null);
-				skipListeners.add(skipListener);
-			}
-			if(listener instanceof SkipWriteListener) {
-				SkipListener<I, O> skipListener = new SkipListenerAdapter<>(null, null, (SkipWriteListener) listener);
-				skipListeners.add(skipListener);
-			}
 			if (listener instanceof StepExecutionListener) {
 				StepExecutionListener stepExecutionListener = (StepExecutionListener) listener;
 				stepExecutionListeners.add(stepExecutionListener);
 			}
-			if(listener instanceof jakarta.batch.api.listener.StepListener) {
-				StepExecutionListener stepExecutionListener = new StepListenerAdapter((jakarta.batch.api.listener.StepListener) listener);
-				stepExecutionListeners.add(stepExecutionListener);
-			}
 			if (listener instanceof ChunkListener) {
 				ChunkListener chunkListener = (ChunkListener) listener;
 				chunkListeners.add(chunkListener);
 			}
-			if(listener instanceof jakarta.batch.api.chunk.listener.ChunkListener) {
-				ChunkListener chunkListener = new ChunkListenerAdapter((jakarta.batch.api.chunk.listener.ChunkListener) listener);
-				chunkListeners.add(chunkListener);
-			}
 			if (listener instanceof ItemReadListener) {
 				ItemReadListener<I> readListener = (ItemReadListener<I>) listener;
 				readListeners.add(readListener);
 			}
-			if(listener instanceof jakarta.batch.api.chunk.listener.ItemReadListener) {
-				ItemReadListener<I> itemListener = new ItemReadListenerAdapter<>((jakarta.batch.api.chunk.listener.ItemReadListener) listener);
-				readListeners.add(itemListener);
-			}
 			if (listener instanceof ItemWriteListener) {
 				ItemWriteListener<O> writeListener = (ItemWriteListener<O>) listener;
 				writeListeners.add(writeListener);
 			}
-			if(listener instanceof jakarta.batch.api.chunk.listener.ItemWriteListener) {
-				ItemWriteListener<O> itemListener = new ItemWriteListenerAdapter<>((jakarta.batch.api.chunk.listener.ItemWriteListener) listener);
-				writeListeners.add(itemListener);
-			}
 			if (listener instanceof ItemProcessListener) {
 				ItemProcessListener<I, O> processListener = (ItemProcessListener<I, O>) listener;
 				processListeners.add(processListener);
 			}
-			if(listener instanceof jakarta.batch.api.chunk.listener.ItemProcessListener) {
-				ItemProcessListener<I,O> itemListener = new ItemProcessListenerAdapter<>((jakarta.batch.api.chunk.listener.ItemProcessListener) listener);
-				processListeners.add(itemListener);
-			}
-			if(listener instanceof RetryReadListener) {
-				jsrRetryListeners.add(new RetryReadListenerAdapter((RetryReadListener) listener));
-			}
-			if(listener instanceof RetryProcessListener) {
-				jsrRetryListeners.add(new RetryProcessListenerAdapter((RetryProcessListener) listener));
-			}
-			if(listener instanceof RetryWriteListener) {
-				jsrRetryListeners.add(new RetryWriteListenerAdapter((RetryWriteListener) listener));
-			}
-			if(listener instanceof PartitionCollector) {
-				PartitionCollectorAdapter adapter = new PartitionCollectorAdapter(partitionQueue, (PartitionCollector) listener);
-				chunkListeners.add(adapter);
-			}
 		}
 	}