Renamed the method for compacting the list

javadev · Aug 11, 2024 · 5cf3fa1 · 5cf3fa1
1 parent 3d90a8e
commit 5cf3fa1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
@@ -242,7 +242,7 @@ public Chain<T> compact() {
 
         @Override
         public Chain<T> compact(final T falsyValue) {
-            return new Chain<>(Underscore.compact(value(), falsyValue));
+            return new Chain<>(Underscore.compactList(value(), falsyValue));
         }
 
         @Override

diff --git a/src/main/java/com/github/underscore/Underscore.java b/src/main/java/com/github/underscore/Underscore.java
@@ -1490,21 +1490,21 @@ public static <E> E[] compact(final E... array) {
         return (E[]) compact(Arrays.asList(array)).toArray();
     }
 
-    public static <E> List<E> compact(final List<E> list, final E falsyValue) {
+    public static <E> List<E> compactList(final List<E> list, final E falsyValue) {
         return filter(list, arg -> !(Objects.equals(arg, falsyValue)));
     }
 
     @SuppressWarnings("unchecked")
     public static <E> E[] compact(final E[] array, final E falsyValue) {
-        return (E[]) compact(Arrays.asList(array), falsyValue).toArray();
+        return (E[]) compactList(Arrays.asList(array), falsyValue).toArray();
     }
 
     public List<T> compact() {
         return compact((List<T>) iterable);
     }
 
     public List<T> compact(final T falsyValue) {
-        return compact((List<T>) iterable, falsyValue);
+        return compactList((List<T>) iterable, falsyValue);
     }
 
     /*
@@ -2898,7 +2898,7 @@ public Chain<T> compact() {
         }
 
         public Chain<T> compact(final T falsyValue) {
-            return new Chain<>(Underscore.compact(list, falsyValue));
+            return new Chain<>(Underscore.compactList(list, falsyValue));
         }
 
         @SuppressWarnings("unchecked")

diff --git a/src/test/java/com/github/underscore/ArraysTest.java b/src/test/java/com/github/underscore/ArraysTest.java
@@ -659,7 +659,7 @@ void lastOrNull() {
     void compact() {
         final List<?> result = Underscore.compact(asList(0, 1, false, 2, "", 3));
         assertEquals("[1, 2, 3]", result.toString());
-        final List<?> result2 = Underscore.compact(Arrays.<Object>asList(0, 1, false, 2, "", 3), 1);
+        final List<?> result2 = Underscore.compactList(Arrays.<Object>asList(0, 1, false, 2, "", 3), 1);
         assertEquals("[0, false, 2, , 3]", result2.toString());
         final List<?> result3 = Underscore.compact(asList(0, 1, null, 2, "", 3));
         assertEquals("[1, 2, 3]", result3.toString());