[isis] 11/38: ISIS-1742: refactors applib.filter.Predicate#and, #or, #not to the guava equivs

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit a1ef5260e9cd12721cde9d3f24ab5da48c64f78f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:50:19 2017 +0100

    ISIS-1742: refactors applib.filter.Predicate#and, #or, #not to the guava equivs
---
 .../org/apache/isis/applib/filter/Predicates.java  | 31 +++-------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
index 9e4dd8d..450c2e7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
@@ -31,40 +31,15 @@ public final class Predicates {
     }
 
     public static <T> Predicate<T> and(final Predicate<T>... predicates) {
-        return new Predicate<T>() {
-            @Override
-            public boolean apply(final T f) {
-                for(final Predicate<T> predicate : predicates) {
-                    if(!predicate.apply(f)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        };
+        return com.google.common.base.Predicates.and(predicates);
     }
 
     public static <T> Predicate<T> or(final Predicate<T>... predicates) {
-        return new Predicate<T>() {
-            @Override
-            public boolean apply(final T f) {
-                for(final Predicate<T> predicate : predicates) {
-                    if(predicate.apply(f)) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
+        return com.google.common.base.Predicates.or(predicates);
     }
 
     public static <T> Predicate<T> not(final Predicate<T> f1) {
-        return new Predicate<T>() {
-            @Override
-            public boolean apply(final T f) {
-                return !f1.apply(f);
-            }
-        };
+        return com.google.common.base.Predicates.not(f1);
     }
 
     public static <T> Predicate<T> any() {

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.