Rename Work#call to Work#execute

Work is not extend Callable anymore, so using
execute is more appropriate now ("execute a work
unit" is better than "call a work unit").

Author: fmbenhassine

src/main/java/org/jeasy/flows/engine/WorkFlowEngineImpl.java

@@ -36,7 +36,7 @@ class WorkFlowEngineImpl implements WorkFlowEngine {
 
     public WorkReport run(WorkFlow workFlow, WorkContext workContext) {
         LOGGER.info("Running workflow ''{}''", workFlow.getName());
-        return workFlow.call(workContext);
+        return workFlow.execute(workContext);
     }
 
 }

src/main/java/org/jeasy/flows/work/NoOpWork.java

@@ -38,7 +38,7 @@ public String getName() {
     }
 
     @Override
-    public WorkReport call(WorkContext workContext) {
+    public WorkReport execute(WorkContext workContext) {
         return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
     }
 }

src/main/java/org/jeasy/flows/work/Work.java

@@ -57,5 +57,5 @@ default String getName() {
      * @param workContext context in which this unit of work is being executed
      * @return the execution report
      */
-    WorkReport call(WorkContext workContext);
+    WorkReport execute(WorkContext workContext);
 }

src/main/java/org/jeasy/flows/workflow/ConditionalFlow.java

@@ -61,13 +61,13 @@ public class ConditionalFlow extends AbstractWorkFlow {
     /**
      * {@inheritDoc}
      */
-    public WorkReport call(WorkContext workContext) {
-        WorkReport jobReport = initialWorkUnit.call(workContext);
+    public WorkReport execute(WorkContext workContext) {
+        WorkReport jobReport = initialWorkUnit.execute(workContext);
         if (predicate.apply(jobReport)) {
-            jobReport = nextOnPredicateSuccess.call(workContext);
+            jobReport = nextOnPredicateSuccess.execute(workContext);
         } else {
             if (nextOnPredicateFailure != null && !(nextOnPredicateFailure instanceof NoOpWork)) { // else is optional
-                jobReport = nextOnPredicateFailure.call(workContext);
+                jobReport = nextOnPredicateFailure.execute(workContext);
             }
         }
         return jobReport;

src/main/java/org/jeasy/flows/workflow/ParallelFlow.java

@@ -64,7 +64,7 @@ public class ParallelFlow extends AbstractWorkFlow {
     /**
      * {@inheritDoc}
      */
-    public ParallelFlowReport call(WorkContext workContext) {
+    public ParallelFlowReport execute(WorkContext workContext) {
         ParallelFlowReport workFlowReport = new ParallelFlowReport();
         List<WorkReport> workReports = workExecutor.executeInParallel(workUnits, workContext);
         workFlowReport.addAll(workReports);

src/main/java/org/jeasy/flows/workflow/ParallelFlowExecutor.java

@@ -47,7 +47,7 @@ class ParallelFlowExecutor {
     List<WorkReport> executeInParallel(List<Work> workUnits, WorkContext workContext) {
         // prepare tasks for parallel submission
         List<Callable<WorkReport>> tasks = new ArrayList<>(workUnits.size());
-        workUnits.forEach(work -> tasks.add(() -> work.call(workContext)));
+        workUnits.forEach(work -> tasks.add(() -> work.execute(workContext)));
 
         // submit work units and wait for results
         List<Future<WorkReport>> futures;

src/main/java/org/jeasy/flows/workflow/RepeatFlow.java

@@ -50,10 +50,10 @@ public class RepeatFlow extends AbstractWorkFlow {
     /**
      * {@inheritDoc}
      */
-    public WorkReport call(WorkContext workContext) {
+    public WorkReport execute(WorkContext workContext) {
         WorkReport workReport;
         do {
-            workReport = work.call(workContext);
+            workReport = work.execute(workContext);
         } while (predicate.apply(workReport));
         return workReport;
     }

src/main/java/org/jeasy/flows/workflow/SequentialFlow.java

@@ -56,10 +56,10 @@ public class SequentialFlow extends AbstractWorkFlow {
     /**
      * {@inheritDoc}
      */
-    public WorkReport call(WorkContext workContext) {
+    public WorkReport execute(WorkContext workContext) {
         WorkReport workReport = null;
         for (Work work : workUnits) {
-            workReport = work.call(workContext);
+            workReport = work.execute(workContext);
             if (workReport != null && FAILED.equals(workReport.getStatus())) {
                 LOGGER.info("Work unit ''{}'' has failed, skipping subsequent work units", work.getName());
                 break;

src/test/java/org/jeasy/flows/engine/WorkFlowEngineImplTest.java

@@ -59,7 +59,7 @@ public void run() {
         workFlowEngine.run(workFlow,workContext);
 
         // then
-        Mockito.verify(workFlow).call(workContext);
+        Mockito.verify(workFlow).execute(workContext);
     }
 
     /**
@@ -177,7 +177,7 @@ public String getName() {
             return "print message work";
         }
 
-        public WorkReport call(WorkContext workContext) {
+        public WorkReport execute(WorkContext workContext) {
             System.out.println(message);
             return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
         }
@@ -198,7 +198,7 @@ public String getName() {
         }
 
         @Override
-        public WorkReport call(WorkContext workContext) {
+        public WorkReport execute(WorkContext workContext) {
             String input = (String) workContext.get("partition" + partition);
             workContext.put("wordCountInPartition" + partition, input.split(" ").length);
             return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
@@ -213,7 +213,7 @@ public String getName() {
         }
 
         @Override
-        public WorkReport call(WorkContext workContext) {
+        public WorkReport execute(WorkContext workContext) {
             Set<Map.Entry<String, Object>> entrySet = workContext.getEntrySet();
             int sum = 0;
             for (Map.Entry<String, Object> entry : entrySet) {
@@ -234,7 +234,7 @@ public String getName() {
         }
 
         @Override
-        public WorkReport call(WorkContext workContext) {
+        public WorkReport execute(WorkContext workContext) {
             int totalCount = (int) workContext.get("totalCount");
             System.out.println(totalCount);
             return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);

src/test/java/org/jeasy/flows/work/NoOpWorkTest.java

@@ -37,8 +37,8 @@ public void getName() {
 	}
 
 	@Test
-	public void call() {
-		WorkReport workReport = work.call(new WorkContext());
+	public void testExecute() {
+		WorkReport workReport = work.execute(new WorkContext());
 		Assert.assertNotNull(workReport);
 		Assertions.assertThat(workReport.getStatus()).isEqualTo(WorkStatus.COMPLETED);
 

src/test/java/org/jeasy/flows/workflow/ConditionalFlowTest.java

@@ -48,12 +48,12 @@ public void callOnPredicateSuccess() {
                 .build();
 
         // when
-        conditionalFlow.call(workContext);
+        conditionalFlow.execute(workContext);
 
         // then
-        Mockito.verify(toExecute, Mockito.times(1)).call(workContext);
-        Mockito.verify(nextOnPredicateSuccess, Mockito.times(1)).call(workContext);
-        Mockito.verify(nextOnPredicateFailure, Mockito.never()).call(workContext);
+        Mockito.verify(toExecute, Mockito.times(1)).execute(workContext);
+        Mockito.verify(nextOnPredicateSuccess, Mockito.times(1)).execute(workContext);
+        Mockito.verify(nextOnPredicateFailure, Mockito.never()).execute(workContext);
     }
 
     @Test
@@ -73,12 +73,12 @@ public void callOnPredicateFailure() {
                 .build();
 
         // when
-        conditionalFlow.call(workContext);
+        conditionalFlow.execute(workContext);
 
         // then
-        Mockito.verify(toExecute, Mockito.times(1)).call(workContext);
-        Mockito.verify(nextOnPredicateFailure, Mockito.times(1)).call(workContext);
-        Mockito.verify(nextOnPredicateSuccess, Mockito.never()).call(workContext);
+        Mockito.verify(toExecute, Mockito.times(1)).execute(workContext);
+        Mockito.verify(nextOnPredicateFailure, Mockito.times(1)).execute(workContext);
+        Mockito.verify(nextOnPredicateSuccess, Mockito.never()).execute(workContext);
     }
 
 }

src/test/java/org/jeasy/flows/workflow/ParallelFlowExecutorTest.java

@@ -40,7 +40,7 @@
 public class ParallelFlowExecutorTest {
 
     @Test
-    public void call() {
+    public void testExecute() {
 
         // given
         ExecutorService executorService = Executors.newFixedThreadPool(2);
@@ -76,7 +76,7 @@ public String getName() {
         }
 
         @Override
-        public WorkReport call(WorkContext workContext) {
+        public WorkReport execute(WorkContext workContext) {
             executed = true;
             return new DefaultWorkReport(status, workContext);
         }

src/test/java/org/jeasy/flows/workflow/ParallelFlowTest.java

@@ -35,7 +35,7 @@
 public class ParallelFlowTest {
 
     @Test
-    public void call() {
+    public void testExecute() {
         // given
         Work work1 = Mockito.mock(Work.class);
         Work work2 = Mockito.mock(Work.class);
@@ -45,7 +45,7 @@ public void call() {
         ParallelFlow parallelFlow = new ParallelFlow("pf", works, parallelFlowExecutor);
 
         // when
-        ParallelFlowReport parallelFlowReport = parallelFlow.call(workContext);
+        ParallelFlowReport parallelFlowReport = parallelFlow.execute(workContext);
 
         // then
         Assertions.assertThat(parallelFlowReport).isNotNull();

src/test/java/org/jeasy/flows/workflow/RepeatFlowTest.java

@@ -43,10 +43,10 @@ public void testRepeatUntil() {
                 .build();
 
         // when
-        repeatFlow.call(workContext);
+        repeatFlow.execute(workContext);
 
         // then
-        Mockito.verify(work, Mockito.times(1)).call(workContext);
+        Mockito.verify(work, Mockito.times(1)).execute(workContext);
     }
 
     @Test
@@ -60,10 +60,10 @@ public void testRepeatTimes() {
                 .build();
 
         // when
-        repeatFlow.call(workContext);
+        repeatFlow.execute(workContext);
 
         // then
-        Mockito.verify(work, Mockito.times(3)).call(workContext);
+        Mockito.verify(work, Mockito.times(3)).execute(workContext);
     }
 
 }

src/test/java/org/jeasy/flows/workflow/SequentialFlowTest.java

@@ -35,7 +35,7 @@
 public class SequentialFlowTest {
 
     @Test
-    public void call() {
+    public void testExecute() {
         // given
         Work work1 = Mockito.mock(Work.class);
         Work work2 = Mockito.mock(Work.class);
@@ -49,13 +49,13 @@ public void call() {
                 .build();
 
         // when
-        sequentialFlow.call(workContext);
+        sequentialFlow.execute(workContext);
 
         // then
         InOrder inOrder = Mockito.inOrder(work1, work2, work3);
-        inOrder.verify(work1, Mockito.times(1)).call(workContext);
-        inOrder.verify(work2, Mockito.times(1)).call(workContext);
-        inOrder.verify(work3, Mockito.times(1)).call(workContext);
+        inOrder.verify(work1, Mockito.times(1)).execute(workContext);
+        inOrder.verify(work2, Mockito.times(1)).execute(workContext);
+        inOrder.verify(work3, Mockito.times(1)).execute(workContext);
     }
 
     @Test
@@ -75,14 +75,14 @@ public void testPassingMultipleWorkUnitsAtOnce() {
                 .build();
 
         // when
-        sequentialFlow.call(workContext);
+        sequentialFlow.execute(workContext);
 
         // then
         InOrder inOrder = Mockito.inOrder(work1, work2, work3, work4);
-        inOrder.verify(work1, Mockito.times(1)).call(workContext);
-        inOrder.verify(work2, Mockito.times(1)).call(workContext);
-        inOrder.verify(work3, Mockito.times(1)).call(workContext);
-        inOrder.verify(work4, Mockito.times(1)).call(workContext);
+        inOrder.verify(work1, Mockito.times(1)).execute(workContext);
+        inOrder.verify(work2, Mockito.times(1)).execute(workContext);
+        inOrder.verify(work3, Mockito.times(1)).execute(workContext);
+        inOrder.verify(work4, Mockito.times(1)).execute(workContext);
     }
 
 }