Remove job execution id from StepExecutionRequest

Step execution IDs are globally unique, and a step
execution always belongs to a job execution. This
commit removes the need to provide a job execution
id when sending step execution requests as this is
not used by clients (StepExecutionRequestHandler).

The job execution ID is still used in the correlation
ID of the message but is not part of the step execution
request anymore.

Author: fmbenhassine

spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java

@@ -210,10 +210,10 @@ protected Set<StepExecution> doHandle(StepExecution managerStepExecution,
 
 		int count = 0;
 
+		long jobExecutionId = managerStepExecution.getJobExecution().getId();
 		for (StepExecution stepExecution : partitionStepExecutions) {
 			Message<StepExecutionRequest> request = createMessage(count++, partitionStepExecutions.size(),
-					new StepExecutionRequest(stepName, stepExecution.getJobExecutionId(), stepExecution.getId()),
-					replyChannel);
+					new StepExecutionRequest(stepName, stepExecution.getId()), jobExecutionId, replyChannel);
 			if (logger.isDebugEnabled()) {
 				logger.debug("Sending request: " + request);
 			}
@@ -279,11 +279,11 @@ else if (logger.isDebugEnabled()) {
 	}
 
 	private Message<StepExecutionRequest> createMessage(int sequenceNumber, int sequenceSize,
-			StepExecutionRequest stepExecutionRequest, PollableChannel replyChannel) {
+			StepExecutionRequest stepExecutionRequest, long jobExecutionId, PollableChannel replyChannel) {
 		return MessageBuilder.withPayload(stepExecutionRequest)
 			.setSequenceNumber(sequenceNumber)
 			.setSequenceSize(sequenceSize)
-			.setCorrelationId(stepExecutionRequest.getJobExecutionId() + ":" + stepExecutionRequest.getStepName())
+			.setCorrelationId(jobExecutionId + ":" + stepExecutionRequest.getStepName())
 			.setReplyChannel(replyChannel)
 			.build();
 	}

spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/StepExecutionRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2018 the original author or authors.
+ * Copyright 2009-2025 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.
@@ -28,33 +28,24 @@ public class StepExecutionRequest implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private Long stepExecutionId;
+	private long stepExecutionId;
 
 	private String stepName;
 
-	// FIXME not used on the remote side, can we remove it?
-	private Long jobExecutionId;
-
 	private StepExecutionRequest() {
 		// For Jackson deserialization
 	}
 
 	/**
 	 * Create a new {@link StepExecutionRequest} instance.
 	 * @param stepName the name of the step to execute
-	 * @param jobExecutionId the id of the job execution
 	 * @param stepExecutionId the id of the step execution
 	 */
-	public StepExecutionRequest(String stepName, Long jobExecutionId, Long stepExecutionId) {
+	public StepExecutionRequest(String stepName, long stepExecutionId) {
 		this.stepName = stepName;
-		this.jobExecutionId = jobExecutionId;
 		this.stepExecutionId = stepExecutionId;
 	}
 
-	public Long getJobExecutionId() {
-		return jobExecutionId;
-	}
-
 	public Long getStepExecutionId() {
 		return stepExecutionId;
 	}
@@ -65,8 +56,7 @@ public String getStepName() {
 
 	@Override
 	public String toString() {
-		return String.format("StepExecutionRequest: [jobExecutionId=%d, stepExecutionId=%d, stepName=%s]",
-				jobExecutionId, stepExecutionId, stepName);
+		return String.format("StepExecutionRequest: [stepExecutionId=%d, stepName=%s]", stepExecutionId, stepName);
 	}
 
 }

spring-batch-integration/src/main/java/org/springframework/batch/integration/remote/RemoteStep.java

@@ -101,7 +101,7 @@ protected void doExecute(StepExecution stepExecution) throws Exception {
 		getJobRepository().updateExecutionContext(workerStepExecution);
 
 		// send step execution request and wait for the remote step to finish
-		StepExecutionRequest stepExecutionRequest = new StepExecutionRequest(this.remoteStepName, jobExecution.getId(),
+		StepExecutionRequest stepExecutionRequest = new StepExecutionRequest(this.remoteStepName,
 				workerStepExecution.getId());
 		this.messagingTemplate.convertAndSend(this.messageChannel, stepExecutionRequest);
 		StepExecution updatedWorkerExecution = pollRemoteStep(workerStepExecution);

spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandlerTests.java

@@ -84,11 +84,14 @@ void testHandleNoReply() throws Exception {
 		Message message = mock();
 		// when
 		HashSet<StepExecution> stepExecutions = new HashSet<>();
-		stepExecutions
-			.add(new StepExecution(1L, "step1", new JobExecution(5L, new JobInstance(1L, "job"), new JobParameters())));
+		JobInstance jobInstance = new JobInstance(1L, "job");
+		JobExecution jobExecution = new JobExecution(5L, jobInstance, new JobParameters());
+		StepExecution stepExecution = new StepExecution(1L, "step1", jobExecution);
+		stepExecutions.add(stepExecution);
 		when(stepExecutionSplitter.split(any(StepExecution.class), eq(1))).thenReturn(stepExecutions);
 		when(message.getPayload()).thenReturn(Collections.emptySet());
 		when(operations.receive((PollableChannel) any())).thenReturn(message);
+		when(managerStepExecution.getJobExecution()).thenReturn(jobExecution);
 		// set
 		messageChannelPartitionHandler.setMessagingOperations(operations);
 
@@ -113,11 +116,14 @@ void testHandleWithReplyChannel() throws Exception {
 		PollableChannel replyChannel = mock();
 		// when
 		HashSet<StepExecution> stepExecutions = new HashSet<>();
-		stepExecutions
-			.add(new StepExecution(1L, "step1", new JobExecution(5L, new JobInstance(1L, "job"), new JobParameters())));
+		JobInstance jobInstance = new JobInstance(1L, "job");
+		JobExecution jobExecution = new JobExecution(5L, jobInstance, new JobParameters());
+		StepExecution stepExecution = new StepExecution(1L, "step1", jobExecution);
+		stepExecutions.add(stepExecution);
 		when(stepExecutionSplitter.split(any(StepExecution.class), eq(1))).thenReturn(stepExecutions);
 		when(message.getPayload()).thenReturn(Collections.emptySet());
 		when(operations.receive(replyChannel)).thenReturn(message);
+		when(managerStepExecution.getJobExecution()).thenReturn(jobExecution);
 		// set
 		messageChannelPartitionHandler.setMessagingOperations(operations);
 		messageChannelPartitionHandler.setReplyChannel(replyChannel);
@@ -141,8 +147,11 @@ void messageReceiveTimeout() throws Exception {
 		MessagingTemplate operations = mock();
 		// when
 		HashSet<StepExecution> stepExecutions = new HashSet<>();
-		stepExecutions
-			.add(new StepExecution(1L, "step1", new JobExecution(5L, new JobInstance(1L, "job"), new JobParameters())));
+		JobInstance jobInstance = new JobInstance(1L, "job");
+		JobExecution jobExecution = new JobExecution(5L, jobInstance, new JobParameters());
+		StepExecution stepExecution = new StepExecution(1L, "step1", jobExecution);
+		stepExecutions.add(stepExecution);
+		when(managerStepExecution.getJobExecution()).thenReturn(jobExecution);
 		when(stepExecutionSplitter.split(any(StepExecution.class), eq(1))).thenReturn(stepExecutions);
 		// set
 		messageChannelPartitionHandler.setMessagingOperations(operations);

spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/StepExecutionRequestTests.java

@@ -30,14 +30,14 @@
 class StepExecutionRequestTests {
 
 	private static final String SERIALIZED_REQUEST = """
-			{"stepName":"step","jobExecutionId":1,"stepExecutionId":1}""";
+			{"stepName":"step","stepExecutionId":1}""";
 
 	private final JsonMapper jsonMapper = new JsonMapper();
 
 	@Test
 	void stepExecutionRequestShouldBeSerializableWithJackson() throws IOException {
 		// given
-		StepExecutionRequest request = new StepExecutionRequest("step", 1L, 1L);
+		StepExecutionRequest request = new StepExecutionRequest("step", 1L);
 
 		// when
 		String serializedRequest = this.jsonMapper.writeValueAsString(request);
@@ -55,7 +55,6 @@ void stepExecutionRequestShouldBeDeserializableWithJackson() throws IOException
 		// then
 		assertNotNull(deserializedRequest);
 		assertEquals("step", deserializedRequest.getStepName());
-		assertEquals(1L, deserializedRequest.getJobExecutionId().longValue());
 		assertEquals(1L, deserializedRequest.getStepExecutionId().longValue());
 	}