Support for java.util.function.Function

Author: basil

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

@@ -1,6 +1,5 @@
 package org.jenkinsci.plugins.workflow.steps;
 
-import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.io.Serializable;
@@ -10,6 +9,7 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -181,6 +181,14 @@ public static ListenableFuture<?> applyAll(Function<StepExecution,Void> f) {
         return Futures.allAsList(futures);
     }
 
+    /**
+     * @deprecated use {@link #applyAll(Function)}
+     */
+    @Deprecated
+    public static ListenableFuture<?> applyAll(com.google.common.base.Function<StepExecution, Void> f) {
+        return applyAll(fromGuava(f));
+    }
+
     /**
      * Applies only to the specific subtypes.
      */
@@ -195,5 +203,18 @@ public Void apply(StepExecution e) {
         });
     }
 
+    /**
+     * @deprecated use {@link #applyAll(Class, Function)}
+     */
+    @Deprecated
+    public static <T extends StepExecution> ListenableFuture<?> applyAll(
+            final Class<T> type, final com.google.common.base.Function<T, Void> f) {
+        return applyAll(type, fromGuava(f));
+    }
+
+    private static <T, R> Function<T, R> fromGuava(com.google.common.base.Function<T, R> func) {
+        return func::apply;
+    }
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,9 +1,10 @@
 package org.jenkinsci.plugins.workflow.steps;
 
-import com.google.common.base.Function;
 import com.google.common.util.concurrent.ListenableFuture;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
+import java.util.function.Function;
 
 /**
  * Enumerates active running {@link StepExecution}s in the system.
@@ -21,7 +22,31 @@ public abstract class StepExecutionIterator implements ExtensionPoint {
      * @return
      *      {@link ListenableFuture} to signal the completion of the application.
      */
-    public abstract ListenableFuture<?> apply(Function<StepExecution,Void> f);
+    public /* abstract */ ListenableFuture<?> apply(Function<StepExecution, Void> f) {
+        return Util.ifOverridden(
+                () -> apply(toGuava(f)),
+                StepExecutionIterator.class,
+                getClass(),
+                "apply",
+                com.google.common.base.Function.class);
+    }
+
+    /**
+     * @deprecated use {@link #apply(Function)}
+     */
+    @Deprecated
+    public /* abstract */ ListenableFuture<?> apply(com.google.common.base.Function<StepExecution, Void> f) {
+        return Util.ifOverridden(
+                () -> apply(fromGuava(f)), StepExecutionIterator.class, getClass(), "apply", Function.class);
+    }
+
+    private static <T, R> Function<T, R> fromGuava(com.google.common.base.Function<T, R> func) {
+        return func::apply;
+    }
+
+    private static <T, R> com.google.common.base.Function<T, R> toGuava(Function<T, R> func) {
+        return func::apply;
+    }
 
     public static ExtensionList<StepExecutionIterator> all() {
         return ExtensionList.lookup(StepExecutionIterator.class);