[LANG-1568] Predicate add.

5 files changed, 53 insertions, 15 deletions

diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
index 56c5028ec..f5894b32b 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
@@ -70,9 +70,9 @@ public interface FailableBiPredicate<T, U, E extends Throwable> {
      * @return a composed {@code FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
      * @throws NullPointerException if other is null
      */
-    default FailableBiPredicate<T, U, E> and(FailableBiPredicate<? super T, ? super U, E> other) {
+    default FailableBiPredicate<T, U, E> and(final FailableBiPredicate<? super T, ? super U, E> other) {
         Objects.requireNonNull(other);
-        return (T t, U u) -> test(t, u) && other.test(t, u);
+        return (final T t, final U u) -> test(t, u) && other.test(t, u);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
index 0c7def5ae..badc2a589 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
@@ -18,7 +18,6 @@
 package org.apache.commons.lang3.function;
 
 import java.util.Objects;
-import java.util.function.BiPredicate;
 import java.util.function.DoublePredicate;
 
 /**
@@ -30,18 +29,6 @@ import java.util.function.DoublePredicate;
 @FunctionalInterface
 public interface FailableDoublePredicate<E extends Throwable> {
 
-    /**
-     * Returns a composed {@code FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
-     *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@code FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
-     * @throws NullPointerException if other is null
-     */
-    default FailableDoublePredicate<E> and(FailableDoublePredicate<E> other) {
-        Objects.requireNonNull(other);
-        return t -> test(t) && other.test(t);
-    }
-
     /** FALSE singleton */
     @SuppressWarnings("rawtypes")
     FailableDoublePredicate FALSE = t -> false;
@@ -71,6 +58,18 @@ public interface FailableDoublePredicate<E extends Throwable> {
     }
 
     /**
+     * Returns a composed {@code FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
+     *
+     * @param other a predicate that will be logically-ANDed with this predicate.
+     * @return a composed {@code FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
+     * @throws NullPointerException if other is null
+     */
+    default FailableDoublePredicate<E> and(final FailableDoublePredicate<E> other) {
+        Objects.requireNonNull(other);
+        return t -> test(t) && other.test(t);
+    }
+
+    /**
      * Returns a predicate that negates this predicate.
      *
      * @return a predicate that negates this predicate.
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
index babfceb87..57e0cb1d1 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
@@ -17,6 +17,7 @@
 
 package org.apache.commons.lang3.function;
 
+import java.util.Objects;
 import java.util.function.IntPredicate;
 
 /**
@@ -57,6 +58,18 @@ public interface FailableIntPredicate<E extends Throwable> {
     }
 
     /**
+     * Returns a composed {@code FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
+     *
+     * @param other a predicate that will be logically-ANDed with this predicate.
+     * @return a composed {@code FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
+     * @throws NullPointerException if other is null
+     */
+    default FailableIntPredicate<E> and(final FailableIntPredicate<E> other) {
+        Objects.requireNonNull(other);
+        return t -> test(t) && other.test(t);
+    }
+
+    /**
      * Returns a predicate that negates this predicate.
      *
      * @return a predicate that negates this predicate.
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
index 33714aa31..154b1dfce 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
@@ -17,6 +17,7 @@
 
 package org.apache.commons.lang3.function;
 
+import java.util.Objects;
 import java.util.function.LongPredicate;
 
 /**
@@ -57,6 +58,18 @@ public interface FailableLongPredicate<E extends Throwable> {
     }
 
     /**
+     * Returns a composed {@code FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
+     *
+     * @param other a predicate that will be logically-ANDed with this predicate.
+     * @return a composed {@code FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
+     * @throws NullPointerException if other is null
+     */
+    default FailableLongPredicate<E> and(final FailableLongPredicate<E> other) {
+        Objects.requireNonNull(other);
+        return t -> test(t) && other.test(t);
+    }
+
+    /**
      * Returns a predicate that negates this predicate.
      *
      * @return a predicate that negates this predicate.
diff --git a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
index 160f2f571..081464a69 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
@@ -17,6 +17,7 @@
 
 package org.apache.commons.lang3.function;
 
+import java.util.Objects;
 import java.util.function.Predicate;
 
 /**
@@ -60,6 +61,18 @@ public interface FailablePredicate<T, E extends Throwable> {
     }
 
     /**
+     * Returns a composed {@code FailablePredicate} like {@link Predicate#and(Predicate)}.
+     *
+     * @param other a predicate that will be logically-ANDed with this predicate.
+     * @return a composed {@code FailablePredicate} like {@link Predicate#and(Predicate)}.
+     * @throws NullPointerException if other is null
+     */
+    default FailablePredicate<T, E> and(final FailablePredicate<? super T, E> other) {
+        Objects.requireNonNull(other);
+        return t -> test(t) && other.test(t);
+    }
+
+    /**
      * Returns a predicate that negates this predicate.
      *
      * @return a predicate that negates this predicate.