refactor (organize import and quality issues) after resolving conflicts

#3757

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

@@ -15,12 +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.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.*;
@@ -40,6 +37,9 @@
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.support.ListItemReader;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -54,13 +54,15 @@
 
 import javax.sql.DataSource;
 import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author Fabrice Bibonne
  */
 class FlowJobBuilderTests {
 
@@ -374,7 +376,7 @@ void testStepNamesMustBeUniqueWithinFlowDefinition() throws JobInstanceAlreadyCo
 				new JobParametersBuilder().addLong("random", 2L)
 					.addString("stepTwo.name", JobConfigurationForStepNameUnique.SHARED_NAME)
 					.toJobParameters());
-		assertTrue(jobExecution.getAllFailureExceptions()
+		Assertions.assertTrue(jobExecution.getAllFailureExceptions()
 			.stream()
 			.map(Object::getClass)
 			.anyMatch(AlreadyUsedStepNameException.class::equals));
@@ -383,7 +385,7 @@ void testStepNamesMustBeUniqueWithinFlowDefinition() throws JobInstanceAlreadyCo
 				new JobParametersBuilder().addLong("random", 1L)
 					.addString("stepTwo.name", JobConfigurationForStepNameUnique.SHARED_NAME)
 					.toJobParameters());
-		assertTrue(jobExecution.getAllFailureExceptions()
+		Assertions.assertTrue(jobExecution.getAllFailureExceptions()
 			.stream()
 			.map(Object::getClass)
 			.anyMatch(AlreadyUsedStepNameException.class::equals));