test(check unicity of job name in a flow) failing test

Author: Fabrice Bibonne

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/AlreadyUsedStepNameException.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2006-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.batch.core.job.builder;
+
+/**
+ * Exception to indicate the name of a step is already used by a different step in the same flow.
+ * Step names must be unique within a flow definition because the search of the next step to find
+ * relies on the step name
+ *
+ * @author Fabrice Bibonne
+ *
+ */
+public class AlreadyUsedStepNameException extends RuntimeException{
+
+    public AlreadyUsedStepNameException(String name){
+        super("the name "+name+" is already used");
+    }
+
+}

spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java

@@ -15,24 +15,9 @@
  */
 package org.springframework.batch.core.job.builder;
 
-import java.util.Arrays;
-
-import javax.sql.DataSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.*;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.batch.core.configuration.annotation.JobScope;
 import org.springframework.batch.core.job.flow.Flow;
@@ -51,12 +36,18 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.jdbc.support.JdbcTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.support.JdbcTransactionManager;
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.PlatformTransactionManager;
 
+import javax.sql.DataSource;
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
@@ -262,26 +253,6 @@ public FlowExecutionStatus decide(JobExecution jobExecution, @Nullable StepExecu
 		assertEquals(1, execution.getStepExecutions().size());
 	}
 
-	@Test
-	void testBuildWithDeciderPriorityOnWildcardCount() {
-		JobExecutionDecider decider = (jobExecution, stepExecution) -> new FlowExecutionStatus("COMPLETED_PARTIALLY");
-		JobFlowBuilder builder = new JobBuilder("flow_priority", jobRepository).start(decider);
-		builder.on("**").end();
-		builder.on("*").fail();
-		builder.build().preventRestart().build().execute(execution);
-		assertEquals(BatchStatus.COMPLETED, execution.getStatus());
-	}
-
-	@Test
-	void testBuildWithDeciderPriorityWithEqualWildcard() {
-		JobExecutionDecider decider = (jobExecution, stepExecution) -> new FlowExecutionStatus("COMPLETED_PARTIALLY");
-		JobFlowBuilder builder = new JobBuilder("flow_priority", jobRepository).start(decider);
-		builder.on("COMPLETED*").end();
-		builder.on("*").fail();
-		builder.build().preventRestart().build().execute(execution);
-		assertEquals(BatchStatus.COMPLETED, execution.getStatus());
-	}
-
 	@Test
 	void testBuildWithDeciderPriority() {
 		JobExecutionDecider decider = (jobExecution, stepExecution) -> new FlowExecutionStatus("COMPLETED_PARTIALLY");
@@ -383,6 +354,41 @@ void testBuildWithJobScopedStep() throws Exception {
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 	}
 
+    //https://github.com/spring-projects/spring-batch/issues/3757#issuecomment-1821593539
+    @Test
+    void testStepNamesMustBeUniqueWithinFlowDefinition() {
+        Step conditionalStep = new StepSupport("conditionalStep") {
+            @Override
+            public void execute(StepExecution stepExecution) {
+                stepExecution.upgradeStatus(BatchStatus.COMPLETED);
+                stepExecution.setExitStatus(ExitStatus.COMPLETED);
+                String exitStatus = (System.currentTimeMillis() % 2 == 0) ? "EVEN" : "ODD";
+                stepExecution.setExitStatus(new ExitStatus(exitStatus));
+                jobRepository.update(stepExecution);
+            }
+        };
+
+        StepSupport misnamedStep = new StepSupport(step3Name) {
+            @Override
+            public void execute(StepExecution stepExecution)
+                    throws UnexpectedJobExecutionException {
+
+                stepExecution.upgradeStatus(BatchStatus.COMPLETED);
+                stepExecution.setExitStatus(ExitStatus.COMPLETED);
+                jobRepository.update(stepExecution);
+            }
+        };
+
+        JobBuilder jobBuilder = new JobBuilder("flow", jobRepository);
+        FlowBuilder<FlowJobBuilder> flowBuilder = jobBuilder.start(conditionalStep)
+                .on("ODD").to(step2)
+                .from(conditionalStep).on("EVEN").to(step3)
+                .from(step3);
+        assertThrows(AlreadyUsedStepNameException.class, () -> flowBuilder.next(misnamedStep));
+        flowBuilder.end().build();
+    }
+
+
 	@EnableBatchProcessing
 	@Configuration
 	static class JobConfiguration {