Rename Block with Consumer and Function with Supplier.

Replace Function1 with Function, remove Function2 and
Function4.
Rename classes in lodash, math and string plugin.

Author: javadev

lodash-plugin/src/main/java/com/github/underscore/lodash/$.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2017 Valentyn Kolesnikov
+ * Copyright 2015-2018 Valentyn Kolesnikov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,8 @@
  */
 package com.github.underscore.lodash;
 
-import com.github.underscore.Block;
-import com.github.underscore.Function1;
+import com.github.underscore.Consumer;
+import com.github.underscore.Function;
 import com.github.underscore.Function3;
 import com.github.underscore.FunctionAccum;
 import com.github.underscore.Predicate;
@@ -157,7 +157,7 @@ public Chain flatten() {
             return new Chain($.flatten(value()));
         }
 
-        public <F> Chain<F> map(final Function1<? super T, F> func) {
+        public <F> Chain<F> map(final Function<? super T, F> func) {
             return new Chain<F>($.map(value(), func));
         }
 
@@ -202,7 +202,7 @@ public Chain<Comparable> max() {
             return new Chain<Comparable>($.max((Collection) value()));
         }
 
-        public <F extends Comparable<? super F>> Chain<T> max(final Function1<T, F> func) {
+        public <F extends Comparable<? super F>> Chain<T> max(final Function<T, F> func) {
             return new Chain<T>($.max(value(), func));
         }
 
@@ -211,7 +211,7 @@ public Chain<Comparable> min() {
             return new Chain<Comparable>($.min((Collection) value()));
         }
 
-        public <F extends Comparable<? super F>> Chain<T> min(final Function1<T, F> func) {
+        public <F extends Comparable<? super F>> Chain<T> min(final Function<T, F> func) {
             return new Chain<T>($.min(value(), func));
         }
 
@@ -225,7 +225,7 @@ public <F extends Comparable<? super F>> Chain<F> sortWith(final Comparator<F> c
             return new Chain<F>($.sortWith((List<F>) value(), comparator));
         }
 
-        public <F extends Comparable<? super F>> Chain<T> sortBy(final Function1<T, F> func) {
+        public <F extends Comparable<? super F>> Chain<T> sortBy(final Function<T, F> func) {
             return new Chain<T>($.sortBy(value(), func));
         }
 
@@ -234,15 +234,15 @@ public <K> Chain<Map<K, Comparable>> sortBy(final K key) {
             return new Chain<Map<K, Comparable>>($.sortBy((List<Map<K, Comparable>>) value(), key));
         }
 
-        public <F> Chain<Map<F, List<T>>> groupBy(final Function1<T, F> func) {
+        public <F> Chain<Map<F, List<T>>> groupBy(final Function<T, F> func) {
             return new Chain<Map<F, List<T>>>($.groupBy(value(), func));
         }
 
         public Chain<Map<Object, List<T>>> indexBy(final String property) {
             return new Chain<Map<Object, List<T>>>($.indexBy(value(), property));
         }
 
-        public <F> Chain<Map<F, Integer>> countBy(final Function1<T, F> func) {
+        public <F> Chain<Map<F, Integer>> countBy(final Function<T, F> func) {
             return new Chain<Map<F, Integer>>($.countBy(value(), func));
         }
 
@@ -258,17 +258,17 @@ public Chain<T> sample(final int howMany) {
             return new Chain<T>($.newArrayList($.sample(value(), howMany)));
         }
 
-        public Chain<T> tap(final Block<T> func) {
+        public Chain<T> tap(final Consumer<T> func) {
             $.tap(value(), func);
             return new Chain<T>(value());
         }
 
-        public Chain<T> forEach(final Block<T> func) {
+        public Chain<T> forEach(final Consumer<T> func) {
             $.forEach(value(), func);
             return new Chain<T>(value());
         }
 
-        public Chain<T> forEachRight(final Block<T> func) {
+        public Chain<T> forEachRight(final Consumer<T> func) {
             $.forEachRight(value(), func);
             return new Chain<T>(value());
         }
@@ -310,7 +310,7 @@ public Chain<T> uniq() {
         }
 
         @SuppressWarnings("unchecked")
-        public <F> Chain<T> uniq(final Function1<T, F> func) {
+        public <F> Chain<T> uniq(final Function<T, F> func) {
             return new Chain<T>($.newArrayList($.uniq(value(), func)));
         }
 
@@ -319,7 +319,7 @@ public Chain<T> distinct() {
         }
 
         @SuppressWarnings("unchecked")
-        public <F> Chain<F> distinctBy(final Function1<T, F> func) {
+        public <F> Chain<F> distinctBy(final Function<T, F> func) {
             return new Chain<F>($.newArrayList((Iterable<F>) $.uniq(value(), func)));
         }
 
@@ -478,7 +478,7 @@ public <F extends Number> Chain<F> sum() {
             return new Chain<F>($.sum((List<F>) value()));
         }
 
-        public <F extends Number> Chain<F> sum(final Function1<T, F> func) {
+        public <F extends Number> Chain<F> sum(final Function<T, F> func) {
             return new Chain<F>($.sum(value(), func));
         }
 
@@ -781,7 +781,7 @@ public static <T> List<T> remove(final List<T> list, final Predicate<T> pred) {
         final List<T> result = newArrayList();
         for (final Iterator<T> iterator = list.iterator(); iterator.hasNext(); ) {
             final T object = iterator.next();
-            if (pred.apply(object)) {
+            if (pred.test(object)) {
                 result.add(object);
                 iterator.remove();
             }
@@ -884,7 +884,7 @@ public static <T extends Number> T sum(final Iterable<T> iterable) {
         return result;
     }
 
-    public static <E, F extends  Number> F sum(final Iterable<E> iterable, final Function1<E, F> func) {
+    public static <E, F extends  Number> F sum(final Iterable<E> iterable, final Function<E, F> func) {
         F result = null;
         for (final E item : iterable) {
             result = add(result, func.apply(item));
@@ -898,7 +898,7 @@ public <F extends Number> F sum() {
     }
 
     @SuppressWarnings("unchecked")
-    public <E, F extends  Number> F sum(final Function1<E, F> func) {
+    public <E, F extends  Number> F sum(final Function<E, F> func) {
         return sum((List<E>) getIterable(), func);
     }
 
@@ -1047,9 +1047,9 @@ public static List<String> words(final String string) {
         return result;
     }
 
-    private static Function1<String, String> createCompounder(
+    private static Function<String, String> createCompounder(
         final Function3<String, String, Integer, String> callback) {
-        return new Function1<String, String>() {
+        return new Function<String, String>() {
             public String apply(final String string) {
                 int index = -1;
                 List<String> array = words(deburr(string));
@@ -1064,8 +1064,8 @@ public String apply(final String string) {
         };
     }
 
-    private static Function1<String, String> createCaseFirst(final String methodName) {
-        return new Function1<String, String>() {
+    private static Function<String, String> createCaseFirst(final String methodName) {
+        return new Function<String, String>() {
             public String apply(final String string) {
                 final String localString = baseToString(string);
                 final String chr = localString.isEmpty() ? "" : localString.substring(0, 1);