update functions, add some short-circuiting logical AND 、OR

Author: ccoderJava

summer-java-core/src/main/java/com/dianpoint/summer/lang/Predicates.java

@@ -39,4 +39,45 @@ static <T> Predicate<T> alwaysFalse() {
     }
 
 
+    static <T> Predicate<? super T> and(Predicate<? super T>... predicates) {
+        int length = predicates == null ? 0 : predicates.length;
+        if (length == 0) {
+            return alwaysTrue();
+        }
+        if (length == 1) {
+            return predicates[0];
+        }
+        Predicate<T> andPredicate = alwaysTrue();
+        for (Predicate<? super T> predicate : predicates) {
+            andPredicate = andPredicate.and(predicate);
+        }
+        return andPredicate;
+    }
+
+    /**
+     * 输出一个逻辑或运算
+     *
+     * @param predicates {@link Predicate predicates}
+     * @param <T>        被判断的对象
+     * @return non-null
+     */
+    static <T> Predicate<? super T> or(Predicate<? super T>... predicates) {
+        int length = predicates == null ? 0 : predicates.length;
+        if (length == 0) {
+            return alwaysFalse();
+        }
+        if (length == 1) {
+            return predicates[0];
+        }
+
+        Predicate<T> orPredicate = alwaysFalse();
+
+        for (Predicate<? super T> predicate : predicates) {
+            orPredicate = orPredicate.or(predicate);
+        }
+        return orPredicate;
+
+    }
+
+
 }

summer-java-core/src/main/java/com/dianpoint/summer/lang/Streams.java

@@ -55,7 +55,7 @@ static <T> Set<T> filterSet(T[] values, Predicate<T> predicate) {
     }
 
 
-    static <T, S extends Iterable<T>> S filterAll(S values, Predicate<? super T> predicate) {
+    static <T, S extends Iterable<T>> S filter(S values, Predicate<? super T> predicate) {
         boolean isSet = SetUtils.isSet(values);
         if (isSet) {
             return (S) filterSet(values, predicate);
@@ -66,5 +66,42 @@ static <T, S extends Iterable<T>> S filterAll(S values, Predicate<? super T> pre
 
     //filter逻辑操作
 
+    //通用的filter过滤方法，对于集合iterable类型进行过滤处理
+    static <T, S extends Iterable<T>> S filterAll(S values, Predicate<? super T>... predicates) {
+        return filter(values, Predicates.and(predicates));
+    }
+
+    //对iterable进行逻辑and 逻辑or处理
+
+    static <T> List<T> filterAllList(T[] values, Predicate<? super T>... predicates) {
+        return filterAll(Arrays.asList(values), predicates);
+    }
+
+    static <T> Set<T> filterAllSet(T[] values, Predicate<? super T>... predicates) {
+        return filterAll(SetUtils.ofSet(values), predicates);
+    }
+
+
+    static <T, S extends Iterable<T>> S filterAny(S values, Predicate<? super T>... predicates) {
+        return filter(values, Predicates.or(predicates));
+    }
+
+    static <T> List<T> filterAnyList(T[] values, Predicate<? super T>... predicates) {
+        return filterAny(Arrays.asList(values), predicates);
+    }
+
+    static <T> Set<T> filterAnySet(T[] values, Predicate<? super T>... predicates) {
+        return filterAny(SetUtils.ofSet(values), predicates);
+    }
+
+
+    //再添加一个findFirst方法
+    static <T> T filterFirst(Iterable<T> values, Predicate<T>... predicates) {
+        return StreamSupport.stream(values.spliterator(), false)
+                .filter(Predicates.and(predicates))
+                .findFirst()
+                .orElse(null);
+    }
+
 
 }