Refactor: Extract Class

Author: temidireDimowo

core/src/main/java/dev/failsafe/FailurePolicyBuilder.java

@@ -23,6 +23,9 @@
 import java.util.List;
 import java.util.Objects;
 
+import static dev.failsafe.FailurePredicates.resultPredicateFor;
+import static dev.failsafe.FailurePredicates.*;
+
 /**
  * A Policy that allows configurable conditions to determine whether an execution is a failure.
  * <ul>
@@ -135,53 +138,4 @@ public S handleResultIf(CheckedPredicate<R> resultPredicate) {
     config.failureConditions.add(resultPredicateFor(resultPredicate));
     return (S) this;
   }
-
-  /**
-   * Returns a predicate that evaluates whether the {@code result} equals an execution result.
-   */
-  static <R> CheckedBiPredicate<R, Throwable> resultPredicateFor(R result) {
-    return (t, u) -> result == null ? t == null && u == null : Objects.equals(result, t);
-  }
-
-  /**
-   * Returns a predicate that evaluates the {@code failurePredicate} against a failure.
-   */
-  @SuppressWarnings("unchecked")
-  static <R> CheckedBiPredicate<R, Throwable> failurePredicateFor(
-    CheckedPredicate<? extends Throwable> failurePredicate) {
-    return (t, u) -> u != null && ((CheckedPredicate<Throwable>) failurePredicate).test(u);
-  }
-
-  /**
-   * Returns a predicate that evaluates the {@code resultPredicate} against a result, when present.
-   * <p>
-   * Short-circuits to false without invoking {@code resultPredicate}, when result is not present (i.e.
-   * BiPredicate.test(null, Throwable)).
-   */
-  static <R> CheckedBiPredicate<R, Throwable> resultPredicateFor(CheckedPredicate<R> resultPredicate) {
-    return (t, u) -> {
-      if (u == null) {
-        return resultPredicate.test(t);
-      } else {
-        // resultPredicate is only defined over the success type.
-        // It doesn't know how to handle a failure of type Throwable,
-        // so we return false here.
-        return false;
-      }
-    };
-  }
-
-  /**
-   * Returns a predicate that returns whether any of the {@code failures} are assignable from an execution failure.
-   */
-  static <R> CheckedBiPredicate<R, Throwable> failurePredicateFor(List<Class<? extends Throwable>> failures) {
-    return (t, u) -> {
-      if (u == null)
-        return false;
-      for (Class<? extends Throwable> failureType : failures)
-        if (failureType.isAssignableFrom(u.getClass()))
-          return true;
-      return false;
-    };
-  }
 }

core/src/main/java/dev/failsafe/FailurePredicates.java

@@ -0,0 +1,42 @@
+package dev.failsafe;
+
+import dev.failsafe.function.CheckedBiPredicate;
+import dev.failsafe.function.CheckedPredicate;
+
+import java.util.List;
+import java.util.Objects;
+
+public final class FailurePredicates {
+    private FailurePredicates() {}
+
+    public static <R> CheckedBiPredicate<R, Throwable> resultPredicateFor(R result) {
+        return (t, u) -> result == null ? t == null && u == null : Objects.equals(result, t);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <R> CheckedBiPredicate<R, Throwable> failurePredicateFor(
+            CheckedPredicate<? extends Throwable> failurePredicate) {
+        return (t, u) -> u != null && ((CheckedPredicate<Throwable>) failurePredicate).test(u);
+    }
+
+    public static <R> CheckedBiPredicate<R, Throwable> resultPredicateFor(CheckedPredicate<R> resultPredicate) {
+        return (t, u) -> {
+            if (u == null) {
+                return resultPredicate.test(t);
+            } else {
+                return false;
+            }
+        };
+    }
+
+    public static <R> CheckedBiPredicate<R, Throwable> failurePredicateFor(List<Class<? extends Throwable>> failures) {
+        return (t, u) -> {
+            if (u == null)
+                return false;
+            for (Class<? extends Throwable> failureType : failures)
+                if (failureType.isAssignableFrom(u.getClass()))
+                    return true;
+            return false;
+        };
+    }
+}