Rename arguments, rename concatTo to the concatWith.

Author: javadev

src/main/java/com/github/underscore/$.java

@@ -312,8 +312,8 @@ public Boolean apply(E arg) {
         }).isPresent();
     }
 
-    public static <E> boolean all(final Iterable<E> set, final Predicate<E> pred) {
-        return every(set, pred);
+    public static <E> boolean all(final Iterable<E> iterable, final Predicate<E> pred) {
+        return every(iterable, pred);
     }
 
     public static <E> boolean some(final Iterable<E> iterable, final Predicate<E> pred) {
@@ -483,13 +483,7 @@ public static <E> Set<E> sample(final List<E> list, final int howMany) {
     }
 
     public static <E, T extends Comparable<? super T>> List<E> sortBy(final List<E> list, final Function1<E, T> func) {
-        final List<E> sortedList = newArrayList();
-        each(list, new Block<E>() {
-            @Override
-            public void apply(E arg) {
-                sortedList.add(arg);
-            }
-        });
+        final List<E> sortedList = newArrayList(list);
         Collections.sort(sortedList, new Comparator<E>() {
             @Override
             public int compare(E o1, E o2) {
@@ -500,13 +494,7 @@ public int compare(E o1, E o2) {
     }
 
     public static <K, V extends Comparable<? super V>> List<Map<K, V>> sortBy(final List<Map<K, V>> list, final K key) {
-        final List<Map<K, V>> sortedList = newArrayList();
-        each(list, new Block<Map<K, V>>() {
-            @Override
-            public void apply(Map<K, V> arg) {
-                sortedList.add(arg);
-            }
-        });
+        final List<Map<K, V>> sortedList = newArrayList(list);
         Collections.sort(sortedList, new Comparator<Map<K, V>>() {
             @Override
             public int compare(Map<K, V> o1, Map<K, V> o2) {
@@ -1784,16 +1772,16 @@ public static <T> List<T> concat(final Iterable<T> first, final Iterable<T> ...
     }
 
 
-    public List<T> concatTo(final Iterable<T> ... other) {
+    public List<T> concatWith(final Iterable<T> ... other) {
         return concat(iterable, other);
     }
 
-    public static <T> List<T> slice(final Iterable<T> list, final int start) {
+    public static <T> List<T> slice(final Iterable<T> iterable, final int start) {
         final List<T> result;
         if (start > 0) {
-            result = newArrayList(list).subList(start, size(list));
+            result = newArrayList(iterable).subList(start, size(iterable));
         } else {
-            result = newArrayList(list).subList(size(list) + start, size(list));
+            result = newArrayList(iterable).subList(size(iterable) + start, size(iterable));
         }
         return result;
     }
@@ -1806,19 +1794,19 @@ public List<T> slice(final int start) {
         return slice(iterable, start);
     }
 
-    public static <T> List<T> slice(final Iterable<T> list, final int start, final int end) {
+    public static <T> List<T> slice(final Iterable<T> iterable, final int start, final int end) {
         final List<T> result;
         if (start > 0) {
             if (end > 0) {
-                result = newArrayList(list).subList(start, end);
+                result = newArrayList(iterable).subList(start, end);
             } else {
-                result = newArrayList(list).subList(start, size(list) + end);
+                result = newArrayList(iterable).subList(start, size(iterable) + end);
             }
         } else {
             if (end > 0) {
-                result = newArrayList(list).subList(size(list) + start, end);
+                result = newArrayList(iterable).subList(size(iterable) + start, end);
             } else {
-                result = newArrayList(list).subList(size(list) + start, size(list) + end);
+                result = newArrayList(iterable).subList(size(iterable) + start, size(iterable) + end);
             }
         }
         return result;
@@ -1832,8 +1820,8 @@ public List<T> slice(final int start, final int end) {
         return slice(iterable, start, end);
     }
 
-    public static <T> List<T> reverse(final Iterable<T> list) {
-        final List<T> result = (List<T>) clone(newArrayList(list));
+    public static <T> List<T> reverse(final Iterable<T> iterable) {
+        final List<T> result = (List<T>) clone(newArrayList(iterable));
         Collections.reverse(result);
         return result;
     }
@@ -1863,17 +1851,17 @@ private static <T> List<T> newArrayList() {
         }
     }
 
-    protected static <T> List<T> newArrayList(Iterable<T> list) {
+    protected static <T> List<T> newArrayList(Iterable<T> iterable) {
         try {
             final Class<?> listsClass = classForName("com.google.common.collect.Lists");
-            return (List<T>) listsClass.getDeclaredMethod("newArrayList", Iterable.class).invoke(null, list);
+            return (List<T>) listsClass.getDeclaredMethod("newArrayList", Iterable.class).invoke(null, iterable);
         } catch (Exception e) {
             final List<T> result;
-            if (list instanceof Collection) {
-                result = new ArrayList<T>((Collection) list);
+            if (iterable instanceof Collection) {
+                result = new ArrayList<T>((Collection) iterable);
             } else {
                 result = new ArrayList<T>();
-                for (final T item : list) {
+                for (final T item : iterable) {
                     result.add(item);
                 }
             }
@@ -1900,13 +1888,13 @@ private static <T> Set<T> newLinkedHashSet() {
         }
     }
 
-    private static <T> Set<T> newHashSet(Iterable<T> list) {
+    private static <T> Set<T> newHashSet(Iterable<T> iterable) {
         try {
             final Class<?> setsClass = classForName("com.google.common.collect.Sets");
-            return (Set<T>) setsClass.getDeclaredMethod("newHashSet", Iterable.class).invoke(null, list);
+            return (Set<T>) setsClass.getDeclaredMethod("newHashSet", Iterable.class).invoke(null, iterable);
         } catch (Exception e) {
             final Set<T> result = new HashSet<T>();
-            for (final T item : list) {
+            for (final T item : iterable) {
                 result.add(item);
             }
             return result;

src/test/java/com/github/underscore/FunctionsTest.java

@@ -126,7 +126,7 @@ public void defer() throws Exception {
         final Integer[] counter = new Integer[] {0};
         $.defer(new Function<Void>() { public Void apply() { counter[0]++; return null; } });
         assertEquals("incr was debounced", 0, counter[0]);
-        Thread.sleep(16);
+        Thread.sleep(32);
         assertEquals("incr was debounced", 1, counter[0]);
     }
 

src/test/java/com/github/underscore/UnderscoreTest.java

@@ -87,11 +87,11 @@ public void compareStrings() {
     public void concat() {
         assertEquals(asList(1, 2, 3, 4), asList($.concat(new Integer[] {1, 2}, new Integer[] {3, 4})));
         assertEquals(asList(1, 2, 3, 4), $.concat(asList(1, 2), asList(3, 4)));
-        assertEquals(asList(1, 2, 3, 4), new $(asList(1, 2)).concatTo(asList(3, 4)));
+        assertEquals(asList(1, 2, 3, 4), new $(asList(1, 2)).concatWith(asList(3, 4)));
         assertEquals("[1, 2, 3, 4]", $.chain(asList(1, 2)).concat(asList(3, 4)).value().toString());
         assertEquals(asList(1, 2, 3, 4), asList($.concat(new Integer[] {1, 2}, new Integer[] {3}, new Integer[] {4})));
         assertEquals(asList(1, 2, 3, 4), $.concat(asList(1, 2), asList(3), asList(4)));
-        assertEquals(asList(1, 2, 3, 4), new $(asList(1, 2)).concatTo(asList(3), asList(4)));
+        assertEquals(asList(1, 2, 3, 4), new $(asList(1, 2)).concatWith(asList(3), asList(4)));
     }
 
 /*