Add filterFalse(list, pred) method support.

javadev · web-flow · commit e90f9eb787d9 · 2017-10-31T14:19:29.000+02:00
diff --git a/lodash-plugin/src/main/java/com/github/underscore/lodash/$.java b/lodash-plugin/src/main/java/com/github/underscore/lodash/$.java
@@ -177,6 +177,10 @@ public Chain<T> reject(final Predicate<T> pred) {
             return new Chain<T>($.reject(value(), pred));
         }
 
+        public Chain<T> filterFalse(final Predicate<T> pred) {
+            return new Chain<T>($.filterFalse(value(), pred));
+        }
+
         public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {
             return new Chain<F>($.reduce(value(), func, zeroElem));
         }
diff --git a/lodash-plugin/src/test/java/com/github/underscore/lodash/LodashTest.java b/lodash-plugin/src/test/java/com/github/underscore/lodash/LodashTest.java
@@ -612,6 +612,8 @@ public void chain() {
             public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).rejectIndexed(new PredicateIndexed<String>() {
             public boolean apply(int index, String str) { return true; } });
+        $.chain(new String[] {""}).filterFalse(new Predicate<String>() {
+            public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).reduce(new FunctionAccum<String, String>() {
             public String apply(String accum, String str) { return null; } }, "");
         $.chain(new String[] {""}).reduceRight(new FunctionAccum<String, String>() {
diff --git a/math-plugin/src/main/java/com/github/underscore/math/$.java b/math-plugin/src/main/java/com/github/underscore/math/$.java
@@ -131,6 +131,10 @@ public Chain<T> reject(final Predicate<T> pred) {
             return new Chain<T>($.reject(value(), pred));
         }
 
+        public Chain<T> filterFalse(final Predicate<T> pred) {
+            return new Chain<T>($.filterFalse(value(), pred));
+        }
+
         public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {
             return new Chain<F>($.reduce(value(), func, zeroElem));
         }
diff --git a/math-plugin/src/test/java/com/github/underscore/math/MathTest.java b/math-plugin/src/test/java/com/github/underscore/math/MathTest.java
@@ -287,6 +287,8 @@ public void chain() {
             public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).rejectIndexed(new PredicateIndexed<String>() {
             public boolean apply(int index, String str) { return true; } });
+        $.chain(new String[] {""}).filterFalse(new Predicate<String>() {
+            public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).reduce(new FunctionAccum<String, String>() {
             public String apply(String accum, String str) { return null; } }, "");
         $.chain(new String[] {""}).reduceRight(new FunctionAccum<String, String>() {
diff --git a/src/main/java/com/github/underscore/$.java b/src/main/java/com/github/underscore/$.java
@@ -396,6 +396,18 @@ public Boolean apply(E input) {
         });
     }
 
+    public static <E> List<E> filterFalse(final List<E> list, final Predicate<E> pred) {
+        return reject(list, pred);
+    }
+
+    public List<T> filterFalse(final Predicate<T> pred) {
+        return reject(pred);
+    }
+
+    public static <E> Set<E> filterFalse(final Set<E> set, final Predicate<E> pred) {
+        return reject(set, pred);
+    }
+
     public static <E> boolean every(final Iterable<E> iterable, final Predicate<E> pred) {
         return !find(iterable, new Predicate<E>() {
             @Override
@@ -2065,6 +2077,10 @@ public Chain<T> rejectIndexed(final PredicateIndexed<T> pred) {
             return new Chain<T>($.rejectIndexed(list, pred));
         }
 
+        public Chain<T> filterFalse(final Predicate<T> pred) {
+            return new Chain<T>($.reject(list, pred));
+        }
+
         public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {
             return new Chain<F>($.reduce(list, func, zeroElem));
         }
diff --git a/src/test/java/com/github/underscore/ChainingTest.java b/src/test/java/com/github/underscore/ChainingTest.java
@@ -441,6 +441,28 @@ public Character apply(final String name) {
         assertEquals(4, result.size());
     }
 
+    @Test
+    @SuppressWarnings("unchecked")
+    public void chain9() {
+        final List<Comparable> result = $.chain($.chain($.class.getDeclaredMethods())
+            .reduce(new FunctionAccum<List<String>, Method>() {
+                public List<String> apply(final List<String> accum, final Method method) {
+                    accum.add(method.getName());
+                    return accum;
+                }
+            }, new ArrayList<String>()).item())
+            .filterFalse(new Predicate<String>() {
+                public Boolean apply(final String name) {
+                    return name.contains("$");
+                }
+            })
+            .uniq()
+            .sort()
+            .first(4)
+            .value();
+        assertEquals(4, result.size());
+    }
+
     @Test
     public void chainToMap() {
         assertEquals("{name1=one, name2=two}", $.chain((new LinkedHashMap<String, String>() { {
diff --git a/src/test/java/com/github/underscore/CollectionsTest.java b/src/test/java/com/github/underscore/CollectionsTest.java
@@ -518,6 +518,36 @@ public Boolean apply(Integer item) {
         assertEquals("[2, 4, 6]", resultObject.toString());
     }
 
+/*
+var evens = _.filterFalse([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
+=> [1, 3, 5]
+*/
+    @Test
+    @SuppressWarnings("unchecked")
+    public void filterFalse() {
+        final List<Integer> result = $.filterFalse(asList(1, 2, 3, 4, 5, 6),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        assertEquals("[1, 3, 5]", result.toString());
+        final List<Integer> resultObject = new $<Integer>(asList(1, 2, 3, 4, 5, 6))
+            .filterFalse(new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        assertEquals("[1, 3, 5]", resultObject.toString());
+        final Set<Integer> resultSet = $.filterFalse(new LinkedHashSet(asList(1, 2, 3, 4, 5, 6)),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        assertEquals("[1, 3, 5]", resultSet.toString());
+    }
+
 /*
 var evens = _.filterIndexed([1, 2, 3, 4, 5, 6], function(index, num){ return index !== 1 && num % 2 == 0; });
 => [4, 6]
diff --git a/string-plugin/src/main/java/com/github/underscore/string/$.java b/string-plugin/src/main/java/com/github/underscore/string/$.java
@@ -168,6 +168,10 @@ public Chain<T> reject(final Predicate<T> pred) {
             return new Chain<T>($.reject(value(), pred));
         }
 
+        public Chain<T> filterFalse(final Predicate<T> pred) {
+            return new Chain<T>($.filterFalse(value(), pred));
+        }
+
         public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {
             return new Chain<F>($.reduce(value(), func, zeroElem));
         }
diff --git a/string-plugin/src/test/java/com/github/underscore/string/StringTest.java b/string-plugin/src/test/java/com/github/underscore/string/StringTest.java
@@ -1986,6 +1986,8 @@ public void chain() {
             public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).rejectIndexed(new PredicateIndexed<String>() {
             public boolean apply(int index, String str) { return true; } });
+        $.chain(new String[] {""}).filterFalse(new Predicate<String>() {
+            public Boolean apply(String str) { return true; } });
         $.chain(new String[] {""}).reduce(new FunctionAccum<String, String>() {
             public String apply(String accum, String str) { return null; } }, "");
         $.chain(new String[] {""}).reduceRight(new FunctionAccum<String, String>() {

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,10 @@ public Chain<T> reject(final Predicate<T> pred) {`
`177`	`177`	`return new Chain<T>($.reject(value(), pred));`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ public Chain<T> filterFalse(final Predicate<T> pred) {`
	`181`	`+ return new Chain<T>($.filterFalse(value(), pred));`
	`182`	`+ }`
	`183`	`+`
`180`	`184`	`public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {`
`181`	`185`	`return new Chain<F>($.reduce(value(), func, zeroElem));`
`182`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,10 @@ public Chain<T> reject(final Predicate<T> pred) {`
`131`	`131`	`return new Chain<T>($.reject(value(), pred));`
`132`	`132`	`}`
`133`	`133`
	`134`	`+ public Chain<T> filterFalse(final Predicate<T> pred) {`
	`135`	`+ return new Chain<T>($.filterFalse(value(), pred));`
	`136`	`+ }`
	`137`	`+`
`134`	`138`	`public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {`
`135`	`139`	`return new Chain<F>($.reduce(value(), func, zeroElem));`
`136`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,10 @@ public Chain<T> reject(final Predicate<T> pred) {`
`168`	`168`	`return new Chain<T>($.reject(value(), pred));`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ public Chain<T> filterFalse(final Predicate<T> pred) {`
	`172`	`+ return new Chain<T>($.filterFalse(value(), pred));`
	`173`	`+ }`
	`174`	`+`
`171`	`175`	`public <F> Chain<F> reduce(final FunctionAccum<F, T> func, final F zeroElem) {`
`172`	`176`	`return new Chain<F>($.reduce(value(), func, zeroElem));`
`173`	`177`	`}`