Update Iterables.

Author: gk-brown

kilo-client/src/main/java/org/httprpc/kilo/util/Iterables.java

@@ -266,7 +266,7 @@ public static <T, U extends Comparable<? super U>> Predicate<? super T> whereEqu
      * The comparison predicate.
      */
     public static <T, U extends Comparable<? super U>> Predicate<? super T> whereNotEqualTo(Function<? super T, U> transform, U value) {
-        return whereEqualTo(transform, value).negate();
+        return element -> element != null && transform.apply(element).compareTo(value) != 0;
     }
 
     /**
@@ -495,7 +495,7 @@ public static <T> Predicate<? super T> whereTrue(Function<? super T, Boolean> tr
      * The comparison predicate.
      */
     public static <T> Predicate<? super T> whereFalse(Function<? super T, Boolean> transform) {
-        return whereTrue(transform).negate();
+        return element -> element != null && !transform.apply(element);
     }
 
     /**

kilo-client/src/test/java/org/httprpc/kilo/util/IterablesTest.java

@@ -135,9 +135,9 @@ public void testWhereEqualTo() {
     public void testWhereNotEqualTo() {
         var values = listOf("a", "ab", "abc", null);
 
-        var result = listOf(filter(values, whereNotEqualTo(String::length, 3))); // a, ab, null
+        var result = listOf(filter(values, whereNotEqualTo(String::length, 3))); // a, ab
 
-        assertEquals(listOf("a", "ab", null), result);
+        assertEquals(listOf("a", "ab"), result);
     }
 
     @Test
@@ -225,9 +225,9 @@ public void testWhereTrue() {
     public void testWhereFalse() {
         var values = listOf(true, false, false, null);
 
-        var result = countOf(filter(values, whereFalse(Boolean::booleanValue))); // 3
+        var result = countOf(filter(values, whereFalse(Boolean::booleanValue))); // 2
 
-        assertEquals(3, result);
+        assertEquals(2, result);
     }
 
     @Test