From 5c0b8e23cd262e5e65665e5a1dabbe0b2874f1fe Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Mon, 2 Oct 2023 11:56:17 +0300
Subject: [PATCH] Improved creation of ArrayList and LinkedHashMap

---
 src/main/java/com/github/underscore/U.java    |  86 ++++----
 .../com/github/underscore/Underscore.java     | 102 ++++-----
 .../com/github/underscore/ArraysTest.java     |  12 +-
 .../github/underscore/CollectionsTest.java    |   4 +-
 .../com/github/underscore/LodashTest.java     | 201 +++++++++---------
 .../com/github/underscore/StringTest.java     |   2 +-
 6 files changed, 191 insertions(+), 216 deletions(-)

diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
index 5e7a8496..81c4c369 100644
--- a/src/main/java/com/github/underscore/U.java
+++ b/src/main/java/com/github/underscore/U.java
@@ -1045,7 +1045,7 @@ public List<Object> pull(Object... values) {
     }
 
     public static List<Object> pullAt(final List<Object> list, final Integer... indexes) {
-        final List<Object> result = newArrayList();
+        final List<Object> result = new ArrayList<>();
         final List<Integer> indexesList = Arrays.asList(indexes);
         int index = 0;
         for (final Iterator<Object> iterator = list.iterator(); iterator.hasNext(); ) {
@@ -1065,7 +1065,7 @@ public List<Object> pullAt(final Integer... indexes) {
     }
 
     public static <T> List<T> remove(final List<T> list, final Predicate<T> pred) {
-        final List<T> result = newArrayList();
+        final List<T> result = new ArrayList<>();
         for (final Iterator<T> iterator = list.iterator(); iterator.hasNext(); ) {
             final T object = iterator.next();
             if (pred.test(object)) {
@@ -1149,7 +1149,7 @@ public List<T> xor(final List<T> list) {
     }
 
     public static <T> List<T> at(final List<T> list, final Integer... indexes) {
-        final List<T> result = newArrayList();
+        final List<T> result = new ArrayList<>();
         final List<Integer> indexesList = Arrays.asList(indexes);
         int index = 0;
         for (final T object : list) {
@@ -1874,7 +1874,7 @@ public static <T> T remove(final Map<String, Object> object, final List<String>
 
     public static Map<String, Object> rename(
             final Map<String, Object> map, final String oldKey, final String newKey) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             if (entry.getKey().equals(oldKey)) {
                 outMap.put(newKey, makeObjectForRename(entry.getValue(), oldKey, newKey));
@@ -1890,7 +1890,7 @@ private static Object makeObjectForRename(
             Object value, final String oldKey, final String newKey) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map
@@ -1915,7 +1915,7 @@ public static Map<String, Object> setValue(
             final Map<String, Object> map,
             final String key,
             final BiFunction<String, Object, Object> newValue) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             if (entry.getKey().equals(key)) {
                 outMap.put(
@@ -1934,7 +1934,7 @@ private static Object makeObjectForSetValue(
             Object value, final String key, final BiFunction<String, Object, Object> newValue) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map
@@ -1952,7 +1952,7 @@ private static Object makeObjectForSetValue(
 
     public static Map<String, Object> update(
             final Map<String, Object> map1, final Map<String, Object> map2) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map1.entrySet()) {
             String key = entry.getKey();
             Object value2 = entry.getValue();
@@ -2309,7 +2309,7 @@ && nonNull(timeBetweenRetry)
     }
 
     public static List<String> explode(final String input) {
-        List<String> result = newArrayList();
+        List<String> result = new ArrayList<>();
         if (isNull(input)) {
             return result;
         }
@@ -2511,22 +2511,10 @@ public List<List<T>> createPermutationWithRepetition(final int permutationLength
         return createPermutationWithRepetition((List<T>) value(), permutationLength);
     }
 
-    protected static <T> List<T> newArrayList() {
-        return Underscore.newArrayList();
-    }
-
     protected static <T> List<T> newArrayList(final Iterable<T> iterable) {
         return Underscore.newArrayList(iterable);
     }
 
-    protected static <T> Set<T> newLinkedHashSet() {
-        return Underscore.newLinkedHashSet();
-    }
-
-    protected static <K, E> Map<K, E> newLinkedHashMap() {
-        return Underscore.newLinkedHashMap();
-    }
-
     public static <T> String join(final Iterable<T> iterable, final String separator) {
         return Underscore.join(iterable, separator);
     }
@@ -2615,7 +2603,7 @@ private static Map<String, Object> getStringObjectMap(Object object) {
         if (object instanceof Map) {
             result = (Map<String, Object>) object;
         } else {
-            result = newLinkedHashMap();
+            result = new LinkedHashMap<>();
             result.put("value", object);
         }
         return result;
@@ -2652,7 +2640,7 @@ public static String jsonToXml(
                                 newRootName);
             } else if (mode == JsonToXmlMode.ADD_ROOT
                     && !Xml.XmlValue.getMapKey(object).equals(ROOT)) {
-                final Map<String, Object> map = U.newLinkedHashMap();
+                final Map<String, Object> map = new LinkedHashMap<>();
                 map.put(newRootName, object);
                 result = Xml.toXml(map, identStep);
             } else if (mode == JsonToXmlMode.REMOVE_ARRAY_ATTRIBUTE) {
@@ -2863,7 +2851,7 @@ public static String changeXmlEncoding(String xml, String encoding) {
     }
 
     public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             final String newKey;
             if (entry.getKey().startsWith("-")) {
@@ -2883,7 +2871,7 @@ public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Obj
     private static Object makeObject(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map
@@ -2947,7 +2935,7 @@ public static Map<String, Object> replaceSelfClosingWithEmpty(Map<String, Object
 
     @SuppressWarnings("unchecked")
     public static Object replaceSelfClosingWithValue(Map<String, Object> map, String value) {
-        Object outMap = newLinkedHashMap();
+        Object outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             if (selfClosing.equals(entry.getKey()) && "true".equals(entry.getValue())) {
                 if (map.size() == 1) {
@@ -2968,7 +2956,7 @@ public static Object replaceSelfClosingWithValue(Map<String, Object> map, String
     private static Object makeObjectSelfClose(Object value, String newValue) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map
@@ -2988,7 +2976,7 @@ public static Map<String, Object> replaceEmptyValueWithNull(Map<String, Object>
         if (map == null || map.isEmpty()) {
             return null;
         }
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(String.valueOf(entry.getKey()), makeObjectEmptyValue(entry.getValue()));
         }
@@ -2999,7 +2987,7 @@ public static Map<String, Object> replaceEmptyValueWithNull(Map<String, Object>
     private static Object makeObjectEmptyValue(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? replaceEmptyValueWithNull((Map) item) : item);
             }
@@ -3016,7 +3004,7 @@ public static Object replaceEmptyValueWithEmptyString(Map<String, Object> map) {
         if (map.isEmpty()) {
             return "";
         }
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(String.valueOf(entry.getKey()), makeObjectEmptyString(entry.getValue()));
         }
@@ -3027,7 +3015,7 @@ public static Object replaceEmptyValueWithEmptyString(Map<String, Object> map) {
     private static Object makeObjectEmptyString(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map ? replaceEmptyValueWithEmptyString((Map) item) : item);
@@ -3042,7 +3030,7 @@ private static Object makeObjectEmptyString(Object value) {
     }
 
     public static Map<String, Object> forceAttributeUsage(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(
                     entry.getValue() instanceof Map
@@ -3059,7 +3047,7 @@ public static Map<String, Object> forceAttributeUsage(Map<String, Object> map) {
     private static Object makeAttributeUsage(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? forceAttributeUsage((Map) item) : item);
             }
@@ -3073,12 +3061,12 @@ private static Object makeAttributeUsage(Object value) {
     }
 
     public static Map<String, Object> replaceNullWithEmptyValue(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(
                     entry.getKey(),
                     entry.getValue() == null
-                            ? newLinkedHashMap()
+                            ? (Map<Object, Object>) new LinkedHashMap<Object, Object>()
                             : makeReplaceNullValue(entry.getValue()));
         }
         return outMap;
@@ -3088,7 +3076,7 @@ public static Map<String, Object> replaceNullWithEmptyValue(Map<String, Object>
     private static Object makeReplaceNullValue(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? replaceNullWithEmptyValue((Map) item) : item);
             }
@@ -3102,12 +3090,12 @@ private static Object makeReplaceNullValue(Object value) {
     }
 
     public static Map<String, Object> replaceEmptyStringWithEmptyValue(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(
                     entry.getKey(),
                     "".equals(entry.getValue())
-                            ? newLinkedHashMap()
+                            ? (Map<Object, Object>) new LinkedHashMap<Object, Object>()
                             : makeReplaceEmptyString(entry.getValue()));
         }
         return outMap;
@@ -3117,7 +3105,7 @@ public static Map<String, Object> replaceEmptyStringWithEmptyValue(Map<String, O
     private static Object makeReplaceEmptyString(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(
                         item instanceof Map ? replaceEmptyStringWithEmptyValue((Map) item) : item);
@@ -3132,7 +3120,7 @@ private static Object makeReplaceEmptyString(Object value) {
     }
 
     public static Map<String, Object> replaceNumberAndBooleanWithString(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(
                     entry.getKey(),
@@ -3147,7 +3135,7 @@ public static Map<String, Object> replaceNumberAndBooleanWithString(Map<String,
     private static Object makeReplaceNumberAndBoolean(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 if (item instanceof Map) {
                     values.add(replaceNumberAndBooleanWithString((Map) item));
@@ -3174,7 +3162,7 @@ public static Map<String, Object> replaceFirstLevel(Map<String, Object> map) {
 
     @SuppressWarnings("unchecked")
     public static Map<String, Object> replaceFirstLevel(Map<String, Object> map, int level) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(entry.getKey(), makeReplaceFirstLevel(entry.getValue(), level + 1));
         }
@@ -3193,7 +3181,7 @@ public static Map<String, Object> replaceFirstLevel(Map<String, Object> map, int
     private static Object makeReplaceFirstLevel(Object value, int level) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? replaceFirstLevel((Map) item, level + 1) : item);
             }
@@ -3207,7 +3195,7 @@ private static Object makeReplaceFirstLevel(Object value, int level) {
     }
 
     public static Map<String, Object> replaceNilWithNull(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             Object outValue = makeReplaceNilWithNull(entry.getValue());
             if (outValue instanceof Map
@@ -3227,7 +3215,7 @@ public static Map<String, Object> replaceNilWithNull(Map<String, Object> map) {
     private static Object makeReplaceNilWithNull(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? replaceNilWithNull((Map) item) : item);
             }
@@ -3241,7 +3229,7 @@ private static Object makeReplaceNilWithNull(Object value) {
     }
 
     public static Map<String, Object> deepCopyMap(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        Map<String, Object> outMap = new LinkedHashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             outMap.put(entry.getKey(), makeDeepCopyMap(entry.getValue()));
         }
@@ -3252,7 +3240,7 @@ public static Map<String, Object> deepCopyMap(Map<String, Object> map) {
     private static Object makeDeepCopyMap(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Object> values = newArrayList();
+            List<Object> values = new ArrayList<>();
             for (Object item : (List) value) {
                 values.add(item instanceof Map ? deepCopyMap((Map) item) : item);
             }
@@ -3273,7 +3261,7 @@ public static class Builder {
         private final Map<String, Object> data;
 
         public Builder() {
-            data = newLinkedHashMap();
+            data = new LinkedHashMap<>();
         }
 
         public Builder add(final String key, final Object value) {
@@ -3406,7 +3394,7 @@ public static class ArrayBuilder {
         private final List<Object> data;
 
         public ArrayBuilder() {
-            data = newArrayList();
+            data = new ArrayList<>();
         }
 
         public ArrayBuilder add(final Object value) {
diff --git a/src/main/java/com/github/underscore/Underscore.java b/src/main/java/com/github/underscore/Underscore.java
index 691e7ac1..548070b8 100644
--- a/src/main/java/com/github/underscore/Underscore.java
+++ b/src/main/java/com/github/underscore/Underscore.java
@@ -67,7 +67,7 @@
     "java:S5852"
 })
 public class Underscore<T> {
-    private static final Map<String, Function<String, String>> FUNCTIONS = newLinkedHashMap();
+    private static final Map<String, Function<String, String>> FUNCTIONS = new LinkedHashMap<>();
     private static final Map<String, String> TEMPLATE_SETTINGS = new HashMap<>();
     private static final int MIN_PASSWORD_LENGTH_8 = 8;
     private static final long CAPACITY_SIZE_5 = 5L;
@@ -557,7 +557,7 @@ public static <E> Optional<E> findLast(final Iterable<E> iterable, final Predica
      * Documented, #filter
      */
     public static <E> List<E> filter(final Iterable<E> iterable, final Predicate<E> pred) {
-        final List<E> filtered = newArrayList();
+        final List<E> filtered = new ArrayList<>();
         for (E element : iterable) {
             if (pred.test(element)) {
                 filtered.add(element);
@@ -567,7 +567,7 @@ public static <E> List<E> filter(final Iterable<E> iterable, final Predicate<E>
     }
 
     public static <E> List<E> filter(final List<E> list, final Predicate<E> pred) {
-        final List<E> filtered = newArrayList();
+        final List<E> filtered = new ArrayList<>();
         for (E element : list) {
             if (pred.test(element)) {
                 filtered.add(element);
@@ -577,7 +577,7 @@ public static <E> List<E> filter(final List<E> list, final Predicate<E> pred) {
     }
 
     public List<T> filter(final Predicate<T> pred) {
-        final List<T> filtered = newArrayList();
+        final List<T> filtered = new ArrayList<>();
         for (final T element : value()) {
             if (pred.test(element)) {
                 filtered.add(element);
@@ -587,7 +587,7 @@ public List<T> filter(final Predicate<T> pred) {
     }
 
     public static <E> List<E> filterIndexed(final List<E> list, final PredicateIndexed<E> pred) {
-        final List<E> filtered = newArrayList();
+        final List<E> filtered = new ArrayList<>();
         int index = 0;
         for (E element : list) {
             if (pred.test(index, element)) {
@@ -599,7 +599,7 @@ public static <E> List<E> filterIndexed(final List<E> list, final PredicateIndex
     }
 
     public static <E> Set<E> filter(final Set<E> set, final Predicate<E> pred) {
-        final Set<E> filtered = newLinkedHashSet();
+        final Set<E> filtered = new LinkedHashSet<>();
         for (E element : set) {
             if (pred.test(element)) {
                 filtered.add(element);
@@ -778,7 +778,7 @@ public static <E> boolean include(final Iterable<E> iterable, final E elem) {
     @SuppressWarnings("unchecked")
     public static <E> List<E> invoke(
             final Iterable<E> iterable, final String methodName, final List<Object> args) {
-        final List<E> result = newArrayList();
+        final List<E> result = new ArrayList<>();
         final List<Class<?>> argTypes = map(args, Object::getClass);
         try {
             final Method method =
@@ -1009,14 +1009,14 @@ public static <K, V extends Comparable<? super V>> List<Map<K, V>> sortBy(
      */
     public static <K, E> Map<K, List<E>> groupBy(
             final Iterable<E> iterable, final Function<E, K> func) {
-        final Map<K, List<E>> retVal = newLinkedHashMap();
+        final Map<K, List<E>> retVal = new LinkedHashMap<>();
         for (E e : iterable) {
             final K key = func.apply(e);
             List<E> val;
             if (retVal.containsKey(key)) {
                 val = retVal.get(key);
             } else {
-                val = newArrayList();
+                val = new ArrayList<>();
             }
             val.add(e);
             retVal.put(key, val);
@@ -1033,7 +1033,7 @@ public static <K, E> Map<K, Optional<E>> groupBy(
             final Iterable<E> iterable,
             final Function<E, K> func,
             final BinaryOperator<E> binaryOperator) {
-        final Map<K, Optional<E>> retVal = newLinkedHashMap();
+        final Map<K, Optional<E>> retVal = new LinkedHashMap<>();
         for (Map.Entry<K, List<E>> entry : groupBy(iterable, func).entrySet()) {
             retVal.put(entry.getKey(), reduce(entry.getValue(), binaryOperator));
         }
@@ -1048,7 +1048,7 @@ public <K, E> Map<K, Optional<E>> groupBy(
 
     public static <K, E> Map<K, E> associateBy(
             final Iterable<E> iterable, final Function<E, K> func) {
-        final Map<K, E> retVal = newLinkedHashMap();
+        final Map<K, E> retVal = new LinkedHashMap<>();
         for (E e : iterable) {
             final K key = func.apply(e);
             retVal.putIfAbsent(key, e);
@@ -1084,7 +1084,7 @@ public <K, E> Map<K, List<E>> indexBy(final String property) {
      * Documented, #countBy
      */
     public static <K, E> Map<K, Integer> countBy(final Iterable<E> iterable, Function<E, K> func) {
-        final Map<K, Integer> retVal = newLinkedHashMap();
+        final Map<K, Integer> retVal = new LinkedHashMap<>();
         for (E e : iterable) {
             final K key = func.apply(e);
             if (retVal.containsKey(key)) {
@@ -1097,7 +1097,7 @@ public static <K, E> Map<K, Integer> countBy(final Iterable<E> iterable, Functio
     }
 
     public static <K> Map<K, Integer> countBy(final Iterable<K> iterable) {
-        final Map<K, Integer> retVal = newLinkedHashMap();
+        final Map<K, Integer> retVal = new LinkedHashMap<>();
         for (K key : iterable) {
             if (retVal.containsKey(key)) {
                 retVal.put(key, 1 + retVal.get(key));
@@ -1135,7 +1135,7 @@ public <E> E[] toArray() {
      * Documented, #toMap
      */
     public static <K, V> Map<K, V> toMap(final Iterable<Map.Entry<K, V>> iterable) {
-        final Map<K, V> result = newLinkedHashMap();
+        final Map<K, V> result = new LinkedHashMap<>();
         for (Map.Entry<K, V> entry : iterable) {
             result.put(entry.getKey(), entry.getValue());
         }
@@ -1148,7 +1148,7 @@ public <K, V> Map<K, V> toMap() {
     }
 
     public static <K, V> Map<K, V> toMap(final List<Map.Entry<K, V>> tuples) {
-        final Map<K, V> result = newLinkedHashMap();
+        final Map<K, V> result = new LinkedHashMap<>();
         for (final Map.Entry<K, V> entry : tuples) {
             result.put(entry.getKey(), entry.getValue());
         }
@@ -1161,7 +1161,7 @@ public Map<T, Integer> toCardinalityMap() {
 
     public static <K> Map<K, Integer> toCardinalityMap(final Iterable<K> iterable) {
         Iterator<K> iterator = iterable.iterator();
-        Map<K, Integer> result = newLinkedHashMap();
+        Map<K, Integer> result = new LinkedHashMap<>();
 
         while (iterator.hasNext()) {
             K item = iterator.next();
@@ -1200,8 +1200,8 @@ public static <E> int size(final E... array) {
     }
 
     public static <E> List<List<E>> partition(final Iterable<E> iterable, final Predicate<E> pred) {
-        final List<E> retVal1 = newArrayList();
-        final List<E> retVal2 = newArrayList();
+        final List<E> retVal1 = new ArrayList<>();
+        final List<E> retVal2 = new ArrayList<>();
         for (final E e : iterable) {
             if (pred.test(e)) {
                 retVal1.add(e);
@@ -1511,13 +1511,13 @@ public List<T> compact(final T falsyValue) {
      * Documented, #flatten
      */
     public static <E> List<E> flatten(final List<?> list) {
-        List<E> flattened = newArrayList();
+        List<E> flattened = new ArrayList<>();
         flatten(list, flattened, -1);
         return flattened;
     }
 
     public static <E> List<E> flatten(final List<?> list, final boolean shallow) {
-        List<E> flattened = newArrayList();
+        List<E> flattened = new ArrayList<>();
         flatten(list, flattened, shallow ? 1 : -1);
         return flattened;
     }
@@ -1569,7 +1569,7 @@ public static <E> E[] uniq(final E... array) {
     }
 
     public static <K, E> Collection<E> uniq(final Iterable<E> iterable, final Function<E, K> func) {
-        final Map<K, E> retVal = newLinkedHashMap();
+        final Map<K, E> retVal = new LinkedHashMap<>();
         for (final E e : iterable) {
             final K key = func.apply(e);
             retVal.put(key, e);
@@ -1605,7 +1605,7 @@ public static <K, E> E[] distinctBy(final E[] array, final Function<E, K> func)
      */
     @SuppressWarnings("unchecked")
     public static <E> List<E> union(final List<E> list, final List<E>... lists) {
-        final Set<E> union = newLinkedHashSet();
+        final Set<E> union = new LinkedHashSet<>();
         union.addAll(list);
         for (List<E> localList : lists) {
             union.addAll(localList);
@@ -1620,7 +1620,7 @@ public List<T> unionWith(final List<T>... lists) {
 
     @SuppressWarnings("unchecked")
     public static <E> E[] union(final E[]... arrays) {
-        final Set<E> union = newLinkedHashSet();
+        final Set<E> union = new LinkedHashSet<>();
         for (E[] array : arrays) {
             union.addAll(Arrays.asList(array));
         }
@@ -1631,7 +1631,7 @@ public static <E> E[] union(final E[]... arrays) {
      * Documented, #intersection
      */
     public static <E> List<E> intersection(final List<E> list1, final List<E> list2) {
-        final List<E> result = newArrayList();
+        final List<E> result = new ArrayList<>();
         for (final E item : list1) {
             if (list2.contains(item)) {
                 result.add(item);
@@ -1669,7 +1669,7 @@ public static <E> E[] intersection(final E[]... arrays) {
      * Documented, #difference
      */
     public static <E> List<E> difference(final List<E> list1, final List<E> list2) {
-        final List<E> result = newArrayList();
+        final List<E> result = new ArrayList<>();
         for (final E item : list1) {
             if (!list2.contains(item)) {
                 result.add(item);
@@ -1708,16 +1708,14 @@ public static <E> E[] difference(final E[]... arrays) {
      */
     @SuppressWarnings("unchecked")
     public static <T> List<List<T>> zip(final List<T>... lists) {
-        final List<List<T>> zipped = newArrayList();
+        final List<List<T>> zipped = new ArrayList<>();
         each(
                 Arrays.asList(lists),
                 list -> {
                     int index = 0;
                     for (T elem : list) {
-                        final List<T> nTuple =
-                                index >= zipped.size()
-                                        ? Underscore.newArrayList()
-                                        : zipped.get(index);
+                        final List<T> nTuple;
+                        nTuple = index >= zipped.size() ? new ArrayList<T>() : zipped.get(index);
                         if (index >= zipped.size()) {
                             zipped.add(nTuple);
                         }
@@ -1730,9 +1728,9 @@ public static <T> List<List<T>> zip(final List<T>... lists) {
 
     @SuppressWarnings("unchecked")
     public static <T> List<List<T>> unzip(final List<T>... lists) {
-        final List<List<T>> unzipped = newArrayList();
+        final List<List<T>> unzipped = new ArrayList<>();
         for (int index = 0; index < lists[0].size(); index += 1) {
-            final List<T> nTuple = newArrayList();
+            final List<T> nTuple = new ArrayList<>();
             for (List<T> list : lists) {
                 nTuple.add(list.get(index));
             }
@@ -1893,7 +1891,7 @@ public static List<Integer> range(int start, int stop) {
     }
 
     public static List<Integer> range(int start, int stop, int step) {
-        List<Integer> list = Underscore.newArrayList();
+        List<Integer> list = new ArrayList<>();
         if (step == 0) {
             return list;
         }
@@ -1918,7 +1916,7 @@ public static List<Character> range(char start, char stop) {
     }
 
     public static List<Character> range(char start, char stop, int step) {
-        List<Character> list = Underscore.newArrayList();
+        List<Character> list = new ArrayList<>();
         if (step == 0) {
             return list;
         }
@@ -1936,7 +1934,7 @@ public static List<Character> range(char start, char stop, int step) {
 
     public static <T> List<List<T>> chunk(final Iterable<T> iterable, final int size) {
         if (size <= 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         return chunk(iterable, size, size);
     }
@@ -1944,7 +1942,7 @@ public static <T> List<List<T>> chunk(final Iterable<T> iterable, final int size
     public static <T> List<List<T>> chunk(
             final Iterable<T> iterable, final int size, final int step) {
         if (step <= 0 || size < 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         int index = 0;
         int length = size(iterable);
@@ -1959,7 +1957,7 @@ public static <T> List<List<T>> chunk(
     public static <T> List<List<T>> chunkFill(
             final Iterable<T> iterable, final int size, final T fillValue) {
         if (size <= 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         return chunkFill(iterable, size, size, fillValue);
     }
@@ -1967,7 +1965,7 @@ public static <T> List<List<T>> chunkFill(
     public static <T> List<List<T>> chunkFill(
             final Iterable<T> iterable, final int size, final int step, final T fillValue) {
         if (step <= 0 || size < 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         final List<List<T>> result = chunk(iterable, size, step);
         int difference = size - result.get(result.size() - 1).size();
@@ -1996,7 +1994,7 @@ public List<List<T>> chunkFill(final int size, final int step, T fillvalue) {
     public static <T> List<T> cycle(final Iterable<T> iterable, final int times) {
         int size = Math.abs(size(iterable) * times);
         if (size == 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         List<T> list = newArrayListWithExpectedSize(size);
         int round = 0;
@@ -2019,7 +2017,7 @@ public List<T> cycle(final int times) {
 
     public static <T> List<T> repeat(final T element, final int times) {
         if (times <= 0) {
-            return newArrayList();
+            return new ArrayList<>();
         }
         List<T> result = newArrayListWithExpectedSize(times);
         for (int i = 0; i < times; i++) {
@@ -2341,7 +2339,7 @@ public static <K, V> List<Map.Entry<V, K>> invert(final Map<K, V> object) {
      * Documented, #functions
      */
     public static List<String> functions(final Object object) {
-        final List<String> result = newArrayList();
+        final List<String> result = new ArrayList<>();
         for (final Method method : object.getClass().getDeclaredMethods()) {
             result.add(method.getName());
         }
@@ -2357,7 +2355,7 @@ public static List<String> methods(final Object object) {
      */
     @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> extend(final Map<K, V> destination, final Map<K, V>... sources) {
-        final Map<K, V> result = newLinkedHashMap();
+        final Map<K, V> result = new LinkedHashMap<>();
         result.putAll(destination);
         for (final Map<K, V> source : sources) {
             result.putAll(source);
@@ -2463,7 +2461,7 @@ public static <K, V> List<Map.Entry<K, V>> omit(
      * Documented, #defaults
      */
     public static <K, V> Map<K, V> defaults(final Map<K, V> object, final Map<K, V> defaults) {
-        final Map<K, V> result = newLinkedHashMap();
+        final Map<K, V> result = new LinkedHashMap<>();
         result.putAll(defaults);
         result.putAll(object);
         return result;
@@ -2748,7 +2746,7 @@ public static String format(final String template, final Object... params) {
         }
         matcher.appendTail(buffer);
         final String newTemplate = buffer.toString();
-        final Map<Integer, String> args = newLinkedHashMap();
+        final Map<Integer, String> args = new LinkedHashMap<>();
         index = 0;
         for (Object param : params) {
             args.put(index, param.toString());
@@ -3488,7 +3486,7 @@ public List<T> slice(final int start, final int end) {
     }
 
     public static <T> List<List<T>> splitAt(final Iterable<T> iterable, final int position) {
-        List<List<T>> result = newArrayList();
+        List<List<T>> result = new ArrayList<>();
         int size = size(iterable);
         final int index;
         if (position < 0) {
@@ -3510,7 +3508,7 @@ public List<List<T>> splitAt(final int position) {
     }
 
     public static <T> List<T> takeSkipping(final Iterable<T> iterable, final int stepSize) {
-        List<T> result = newArrayList();
+        List<T> result = new ArrayList<>();
         if (stepSize <= 0) {
             return result;
         }
@@ -3719,10 +3717,6 @@ public static <T> T defaultTo(T value, T defaultValue) {
         return value;
     }
 
-    protected static <T> List<T> newArrayList() {
-        return new ArrayList<>();
-    }
-
     protected static <T> List<T> newArrayList(final Iterable<T> iterable) {
         final List<T> result;
         if (iterable instanceof Collection) {
@@ -3762,10 +3756,6 @@ protected static <T> List<T> newArrayListWithExpectedSize(int size) {
         return new ArrayList<>((int) (CAPACITY_SIZE_5 + size + (size / 10)));
     }
 
-    protected static <T> Set<T> newLinkedHashSet() {
-        return new LinkedHashSet<>();
-    }
-
     protected static <T> Set<T> newLinkedHashSet(Iterable<T> iterable) {
         final Set<T> result = new LinkedHashSet<>();
         for (final T item : iterable) {
@@ -3778,10 +3768,6 @@ protected static <T> Set<T> newLinkedHashSetWithExpectedSize(int size) {
         return new LinkedHashSet<>((int) Math.max(size * CAPACITY_COEFF_2, CAPACITY_SIZE_16));
     }
 
-    protected static <K, E> Map<K, E> newLinkedHashMap() {
-        return new LinkedHashMap<>();
-    }
-
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> and(
             final Predicate<? super T> pred1,
diff --git a/src/test/java/com/github/underscore/ArraysTest.java b/src/test/java/com/github/underscore/ArraysTest.java
index 5ae88215..32375166 100644
--- a/src/test/java/com/github/underscore/ArraysTest.java
+++ b/src/test/java/com/github/underscore/ArraysTest.java
@@ -318,7 +318,7 @@ void chunkFill() {
     @Test
     void cycle() {
         assertEquals("[]", Underscore.cycle(Underscore.range(5), 0).toString());
-        assertEquals("[]", Underscore.cycle(Underscore.newArrayList(), 5).toString());
+        assertEquals("[]", Underscore.cycle(new ArrayList<Object>(), 5).toString());
         assertEquals("[4, 3, 2, 1, 0]", Underscore.cycle(Underscore.range(5), -1).toString());
         assertEquals(
                 "[0, 1, 2, 0, 1, 2, 0, 1, 2]", Underscore.cycle(Underscore.range(3), 3).toString());
@@ -370,8 +370,8 @@ void interpose() {
         assertEquals(
                 "[0, 500, 1, 500, 2, 500, 3]",
                 Underscore.interpose(Underscore.range(4), 500).toString());
-        assertEquals("[]", Underscore.interpose(Underscore.newArrayList(), 500).toString());
-        assertEquals("[]", Underscore.interpose(Underscore.newArrayList(), null).toString());
+        assertEquals("[]", Underscore.interpose(new ArrayList<Integer>(), 500).toString());
+        assertEquals("[]", Underscore.interpose(new ArrayList<Object>(), null).toString());
         assertEquals(
                 "[0, 1, 2, 3]",
                 Underscore.interpose(Underscore.newArrayList(Underscore.range(4)), null)
@@ -385,7 +385,7 @@ void interpose() {
         assertEquals("[a]", Underscore.chain(singletonList("a")).interpose("interpose").toString());
         assertEquals(
                 "[]",
-                Underscore.chain(Underscore.newArrayList()).interpose("interpose").toString());
+                Underscore.chain(new ArrayList<Object>()).interpose("interpose").toString());
         assertEquals(
                 "[a, b, c]", Underscore.chain(asList("a", "b", "c")).interpose(null).toString());
         assertEquals(
@@ -405,8 +405,8 @@ void interpose() {
     */
     @Test
     void interposeByList() {
-        List<String> list1 = Underscore.newArrayList();
-        List<Integer> list2 = Underscore.newArrayList();
+        List<String> list1 = new ArrayList<>();
+        List<Integer> list2 = new ArrayList<>();
         assertEquals(
                 "[0, 100, 1, 200, 2, 300, 3]",
                 Underscore.interposeByList(Underscore.range(4), Underscore.range(100, 600, 100))
diff --git a/src/test/java/com/github/underscore/CollectionsTest.java b/src/test/java/com/github/underscore/CollectionsTest.java
index 4d783dfe..4990b523 100644
--- a/src/test/java/com/github/underscore/CollectionsTest.java
+++ b/src/test/java/com/github/underscore/CollectionsTest.java
@@ -1684,12 +1684,12 @@ void toCardinalityMap() {
         assertEquals(
                 "{a=2, b=1, c=2}",
                 Underscore.toCardinalityMap(asList("a", "a", "b", "c", "c")).toString());
-        assertEquals("{}", Underscore.toCardinalityMap(Underscore.newArrayList()).toString());
+        assertEquals("{}", Underscore.toCardinalityMap(new ArrayList<Object>()).toString());
         assertEquals(
                 "{a=2, b=1, c=2}",
                 new Underscore<>(asList("a", "a", "b", "c", "c")).toCardinalityMap().toString());
         assertEquals(
-                "{}", new Underscore<>(Underscore.newArrayList()).toCardinalityMap().toString());
+                "{}", new Underscore<>(new ArrayList<Object>()).toCardinalityMap().toString());
     }
 
     /*
diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java
index 31b06a77..fbbd72c6 100644
--- a/src/test/java/com/github/underscore/LodashTest.java
+++ b/src/test/java/com/github/underscore/LodashTest.java
@@ -41,6 +41,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
@@ -421,19 +422,19 @@ void set() {
                                 "a[0]",
                                 "e")
                         .toString());
-        Map<String, Object> map = U.newLinkedHashMap();
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        Map<String, Object> map3 = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        Map<String, Object> map3 = new LinkedHashMap<>();
         map.put("a", map2);
         map2.put("#item", map3);
         map3.put("b", "c");
         assertEquals("c", U.<String>set(map, "a.b", "b").toString());
         assertNull(U.<String>set((Map<String, Object>) null, "a", "b"));
-        assertNull(U.<String>set(U.<String, Object>newLinkedHashMap(), "a.b", "b"));
-        Map<String, Object> map4 = U.newLinkedHashMap();
+        assertNull(U.<String>set(new LinkedHashMap<String, Object>(), "a.b", "b"));
+        Map<String, Object> map4 = new LinkedHashMap<>();
         map4.put("a", "b");
         assertNull(U.<String>set(map4, "a.b", "b"));
-        Map<String, Object> map5 = U.newLinkedHashMap();
+        Map<String, Object> map5 = new LinkedHashMap<>();
         map5.put("a", "b");
         assertNull(U.chain(map5.entrySet()).set(asList("a", "b"), "b").value());
     }
@@ -787,31 +788,31 @@ void fetchWrongUrlWithRetry2() {
 
     @Test
     void toJson() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(null, 3);
         assertEquals("{\n  \"null\": 3\n}", U.toJson(map));
-        Map<Object, Object> map2 = U.newLinkedHashMap();
+        Map<Object, Object> map2 = new LinkedHashMap<>();
         map2.put(1, 3);
         assertEquals("{\n  \"1\": 3\n}", U.toJson(map2));
-        Map<Object, Object> map3 = U.newLinkedHashMap();
+        Map<Object, Object> map3 = new LinkedHashMap<>();
         map3.put(true, 3);
         assertEquals("{\n  \"true\": 3\n}", U.toJson(map3));
     }
 
     @Test
     void toXml() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(null, 3);
         assertEquals(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<null number=\"true\">3</null>",
                 U.toXml(map));
-        Map<Object, Object> map2 = U.newLinkedHashMap();
+        Map<Object, Object> map2 = new LinkedHashMap<>();
         map2.put(1, 3);
         assertEquals(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                         + "<__GE__ number=\"true\">3</__GE__>",
                 U.toXml(map2));
-        Map<Object, Object> map3 = U.newLinkedHashMap();
+        Map<Object, Object> map3 = new LinkedHashMap<>();
         map3.put(true, 3);
         assertEquals(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<true number=\"true\">3</true>",
@@ -917,15 +918,15 @@ void xmlToJson() {
                         + "  \"#omit-xml-declaration\": \"yes\"\n"
                         + "}",
                 U.xmlToJson("<a><b/><b/></a>", U.XmlToJsonMode.REPLACE_SELF_CLOSING_WITH_NULL));
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing", "false");
         U.replaceSelfClosingWithNull(map);
-        Map<String, Object> mapEmpty = U.newLinkedHashMap();
+        Map<String, Object> mapEmpty = new LinkedHashMap<>();
         mapEmpty.put("-self-closing", "true");
         U.replaceSelfClosingWithEmpty(mapEmpty);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
         map2.put("list", list);
         U.replaceSelfClosingWithNull(map2);
         assertEquals(
@@ -940,15 +941,15 @@ void xmlToJson() {
                         + "}",
                 U.xmlToJson(
                         "<a><b></b><b></b></a>", U.XmlToJsonMode.REPLACE_EMPTY_VALUE_WITH_NULL));
-        Map<String, Object> map3 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map3 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map3.put("list", list2);
         U.replaceEmptyValueWithNull(map3);
         U.replaceEmptyValueWithNull(null);
-        Map<String, Object> map4 = U.newLinkedHashMap();
-        List<Object> list3 = U.newArrayList();
-        list3.add(U.newArrayList());
+        Map<String, Object> map4 = new LinkedHashMap<>();
+        List<Object> list3 = new ArrayList<>();
+        list3.add(new ArrayList<Object>());
         map4.put("list", list3);
         U.replaceEmptyValueWithEmptyString(map4);
     }
@@ -1002,24 +1003,24 @@ void xmlOrJsonToXml() {
 
     @Test
     void removeMapKey() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing", "false");
         U.remove(map, "test");
         U.remove(map, "-self-closing");
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        list.add(new LinkedHashMap<Object, Object>());
         map2.put("list", list);
         U.remove(map2, "test");
-        map2.put("list2", U.newLinkedHashMap());
+        map2.put("list2", new LinkedHashMap<Object, Object>());
         U.remove(map2, "test");
         U.remove(map2, "list.0");
     }
 
     @Test
     void updateMapValue() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing1", "true");
         map.put("-self-closing2", "false");
         U.update(map, "-self-closing1", "false");
@@ -1036,18 +1037,18 @@ void updateMapValue() {
 
     @Test
     void renameMapKey() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing", "false");
         U.rename(map, "test", "test1");
         Map<String, Object> newMap = U.rename(map, "-self-closing", "-self-closing1");
         assertEquals("{\n" + "  \"-self-closing1\": \"false\"\n" + "}", U.toJson(newMap));
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        list.add(new LinkedHashMap<Object, Object>());
         map2.put("list", list);
         U.rename(map2, "test", "test1");
-        map2.put("list", U.newLinkedHashMap());
+        map2.put("list", new LinkedHashMap<Object, Object>());
         U.rename(map2, "test", "test1");
     }
 
@@ -1121,13 +1122,13 @@ void forceAddRoot() {
                                 + "  ]\n"
                                 + "}",
                         U.JsonToXmlMode.ADD_ROOT));
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        list.add(new LinkedHashMap<Object, Object>());
         map2.put("list", list);
         U.replaceNumberAndBooleanWithString(map2);
-        map2.put("list", U.newLinkedHashMap());
+        map2.put("list", new LinkedHashMap<Object, Object>());
         U.replaceNumberAndBooleanWithString(map2);
     }
 
@@ -1187,40 +1188,40 @@ void forceRemoveArrayTrueBooleanAndNumber() {
 
     @Test
     void updateMapKey() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing", "false");
         U.rename(map, "test", "test1");
         Map<String, Object> newMap = U.update(map, map);
         assertEquals("{\n" + "  \"-self-closing\": \"false\"\n" + "}", U.toJson(newMap));
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        list.add(new LinkedHashMap<Object, Object>());
         map2.put("list", list);
         U.update(map2, map2);
-        map2.put("list", U.newLinkedHashMap());
+        map2.put("list", new LinkedHashMap<Object, Object>());
         U.update(map2, map2);
         U.update(map2, map);
-        Map<String, Object> map3 = U.newLinkedHashMap();
-        map3.put("list", U.newArrayList());
+        Map<String, Object> map3 = new LinkedHashMap<>();
+        map3.put("list", new ArrayList<Object>());
         U.update(map2, map3);
         U.update(map3, map2);
     }
 
     @Test
     void setValue() {
-        Map<String, Object> map = U.newLinkedHashMap();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put("-self-closing", "false");
         U.setValue(map, "test", "test1");
         Map<String, Object> newMap = U.setValue(map, "-self-closing", "true");
         assertEquals("{\n" + "  \"-self-closing\": \"true\"\n" + "}", U.toJson(newMap));
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        list.add(new LinkedHashMap<Object, Object>());
         map2.put("list", list);
         U.setValue(map2, "test", "test1");
-        map2.put("list", U.newLinkedHashMap());
+        map2.put("list", new LinkedHashMap<Object, Object>());
         U.setValue(map2, "test", "test1");
     }
 
@@ -1343,14 +1344,14 @@ void forceAttributeUsage() {
                                 + "  }\n"
                                 + "}",
                         U.JsonToXmlMode.FORCE_ATTRIBUTE_USAGE));
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.forceAttributeUsage(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.forceAttributeUsage(map2);
     }
@@ -1375,14 +1376,14 @@ void replaceNullWithEmptyValue() {
                                 + "  }\n"
                                 + "}",
                         U.JsonToXmlMode.REPLACE_NULL_WITH_EMPTY_VALUE));
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.replaceNullWithEmptyValue(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.replaceNullWithEmptyValue(map2);
     }
@@ -1429,20 +1430,20 @@ void replaceNilWithNull() {
                                                 + "    <value2 xsi:nil=\"true1\"/>\n"
                                                 + "  </author>\n"
                                                 + "</RootElm>"))));
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.replaceNilWithNull(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.replaceNilWithNull(map2);
-        Map<String, Object> map3 = U.newLinkedHashMap();
+        Map<String, Object> map3 = new LinkedHashMap<>();
         map3.put("-nil", "true");
         map3.put("-self-closing", "true1");
-        Map<String, Object> map4 = U.newLinkedHashMap();
+        Map<String, Object> map4 = new LinkedHashMap<>();
         map4.put("map", map3);
         U.replaceNilWithNull(map4);
     }
@@ -1467,14 +1468,14 @@ void replaceEmptyStringWithEmptyValue() {
                                 + "  }\n"
                                 + "}",
                         U.JsonToXmlMode.REPLACE_EMPTY_STRING_WITH_EMPTY_VALUE));
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.replaceEmptyStringWithEmptyValue(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.replaceEmptyStringWithEmptyValue(map2);
     }
@@ -1547,9 +1548,9 @@ void removeMinusesAndConvertNumbers() {
                 U.removeMinusesAndConvertNumbers(
                         (Map<String, Object>) U.fromXml("<a><b c=\"+1ee\"/></a>"));
         assertEquals("{a={b={c=+1ee}}}", result9.toString());
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newArrayList());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
         map.put("list", list);
         Map<String, Object> result10 = U.removeMinusesAndConvertNumbers(map);
         assertEquals("{list=[[]]}", result10.toString());
@@ -1565,14 +1566,14 @@ void replaceFirstLevel() {
         assertEquals("{b=c}", result2.toString());
         String result3 = U.xmlToJson("<a><b>c</b></a>", U.XmlToJsonMode.REMOVE_FIRST_LEVEL);
         assertEquals("{\n  \"b\": \"c\"\n}", result3);
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.replaceFirstLevel(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.replaceFirstLevel(map2);
         Map<String, Object> result4 = U.fromXml("<a/>");
@@ -1587,14 +1588,14 @@ void deepCopyMap() {
         assertEquals("{a={-self-closing=true}, #omit-xml-declaration=yes}", result.toString());
         Map<String, Object> result2 = U.deepCopyMap(U.fromXml("<a><b>c</b></a>"));
         assertEquals("{a={b=c}, #omit-xml-declaration=yes}", result2.toString());
-        Map<String, Object> map = U.newLinkedHashMap();
-        List<Object> list = U.newArrayList();
-        list.add(U.newLinkedHashMap());
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new LinkedHashMap<Object, Object>());
         map.put("list", list);
         U.deepCopyMap(map);
-        Map<String, Object> map2 = U.newLinkedHashMap();
-        List<Object> list2 = U.newArrayList();
-        list2.add(U.newArrayList());
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
         map2.put("list", list2);
         U.deepCopyMap(map2);
         Map<String, Object> result3 = U.fromXml("<a/>");
@@ -1610,9 +1611,9 @@ void objectBuilder() {
         U.Builder.fromJson("{}");
         builder.toXml();
         U.Builder.fromXml("<a/>");
-        U.Builder.fromMap(U.newLinkedHashMap());
-        builder.add(U.newLinkedHashMap());
-        builder.update(U.newLinkedHashMap());
+        U.Builder.fromMap(new LinkedHashMap<String, Object>());
+        builder.add(new LinkedHashMap<String, Object>());
+        builder.update(new LinkedHashMap<String, Object>());
         builder.set("1", "3");
         builder.toString();
         assertEquals("{1=3}", builder.build().toString());
@@ -1736,7 +1737,7 @@ void main() {
         U.of(new int[] {});
         U.of("");
         U.of(new LinkedHashMap<>());
-        U.newLinkedHashSet();
+        new LinkedHashSet<>();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/github/underscore/StringTest.java b/src/test/java/com/github/underscore/StringTest.java
index 7f789a64..60061af1 100644
--- a/src/test/java/com/github/underscore/StringTest.java
+++ b/src/test/java/com/github/underscore/StringTest.java
@@ -84,7 +84,7 @@ void camelCase() {
     @Test
     void explode() {
         assertEquals(asList("a", "b", "c"), U.explode("abc"));
-        assertEquals(U.newArrayList(), U.explode(null));
+        assertEquals(new ArrayList<Object>(), U.explode(null));
     }
 
     /*