Merge pull request #322 from jglick/StepExecution.acceptAll

Using `StepExecution.acceptAll`

Author: jglick

pom.xml

@@ -78,6 +78,12 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- TODO until in BOM: -->
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-step-api</artifactId>
+                <version>686.v603d058a_e148</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java

@@ -306,11 +306,10 @@ private static final class ResetTimer extends SlaveToMasterCallable<Void, Runtim
         }
 
         @Override public Void call() throws RuntimeException {
-            StepExecution.applyAll(TimeoutStepExecution.class, e -> {
+            StepExecution.acceptAll(TimeoutStepExecution.class, e -> {
                 if (id.equals(e.id)) {
                     e.resetTimer();
                 }
-                return null;
             });
             return null;
         }

src/main/java/org/jenkinsci/plugins/workflow/steps/WaitForConditionStep.java

@@ -118,11 +118,10 @@ private Object readResolve() {
         }
 
         private static void retry(final String id, final StepContext context) {
-            StepExecution.applyAll(Execution.class, execution -> {
+            StepExecution.acceptAll(Execution.class, execution -> {
                 if (execution.id.equals(id)) {
                     execution.retry(context);
                 }
-                return null;
             });
         }
 

src/test/java/org/jenkinsci/plugins/workflow/steps/WaitForConditionStepTest.java

@@ -147,10 +147,7 @@ public class WaitForConditionStepTest {
                 WorkflowRun b = p.scheduleBuild2(0).waitForStart();
                 SemaphoreStep.waitForStart("wait/1", b);
                 final List<WaitForConditionStep.Execution> executions = new ArrayList<>();
-                StepExecution.applyAll(WaitForConditionStep.Execution.class, execution -> {
-                    executions.add(execution);
-                    return null;
-                }).get();
+                StepExecution.acceptAll(WaitForConditionStep.Execution.class, executions::add).get();
                 assertEquals(1, executions.size());
                 SemaphoreStep.success("wait/1", false);
                 SemaphoreStep.waitForStart("wait/2", b);