diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index 2afa90a21..a2fd9fb36 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -504,7 +504,7 @@ public class BeanUtil { * @return Map */ public static Map beanToMap(Object bean, boolean isToUnderlineCase, boolean ignoreNullValue) { - return beanToMap(bean, new LinkedHashMap<>(), isToUnderlineCase, ignoreNullValue); + return beanToMap(bean, new LinkedHashMap(), isToUnderlineCase, ignoreNullValue); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index d8f5a59f2..8117de70c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -476,10 +476,10 @@ public class CollUtil { @SafeVarargs public static HashSet newHashSet(boolean isSorted, T... ts) { if (null == ts) { - return isSorted ? new LinkedHashSet<>() : new HashSet<>(); + return isSorted ? new LinkedHashSet() : new HashSet(); } int initialCapacity = Math.max((int) (ts.length / .75f) + 1, 16); - final HashSet set = isSorted ? new LinkedHashSet<>(initialCapacity) : new HashSet<>(initialCapacity); + final HashSet set = isSorted ? new LinkedHashSet(initialCapacity) : new HashSet(initialCapacity); Collections.addAll(set, ts); return set; } @@ -520,7 +520,7 @@ public class CollUtil { if (null == iter) { return newHashSet(isSorted, (T[]) null); } - final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); + final HashSet set = isSorted ? new LinkedHashSet() : new HashSet(); while (iter.hasNext()) { set.add(iter.next()); } @@ -540,7 +540,7 @@ public class CollUtil { if (null == enumeration) { return newHashSet(isSorted, (T[]) null); } - final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); + final HashSet set = isSorted ? new LinkedHashSet() : new HashSet(); while (enumeration.hasMoreElements()) { set.add(enumeration.nextElement()); } @@ -558,7 +558,7 @@ public class CollUtil { * @since 4.1.2 */ public static List list(boolean isLinked) { - return isLinked ? new LinkedList<>() : new ArrayList<>(); + return isLinked ? new LinkedList() : new ArrayList(); } /** @@ -575,7 +575,7 @@ public class CollUtil { if (ArrayUtil.isEmpty(values)) { return list(isLinked); } - final List arrayList = isLinked ? new LinkedList<>() : new ArrayList<>(values.length); + final List arrayList = isLinked ? new LinkedList() : new ArrayList(values.length); Collections.addAll(arrayList, values); return arrayList; } @@ -751,7 +751,7 @@ public class CollUtil { * @return {@link CopyOnWriteArrayList} */ public static CopyOnWriteArrayList newCopyOnWriteArrayList(Collection collection) { - return (null == collection) ? (new CopyOnWriteArrayList<>()) : (new CopyOnWriteArrayList<>(collection)); + return (null == collection) ? (new CopyOnWriteArrayList()) : (new CopyOnWriteArrayList(collection)); } /** @@ -1028,7 +1028,7 @@ public class CollUtil { return list; } - final List list2 = (list instanceof LinkedList) ? new LinkedList<>() : new ArrayList<>(list.size()); + final List list2 = (list instanceof LinkedList) ? new LinkedList() : new ArrayList(list.size()); T modified; for (T t : list) { modified = editor.edit(t); @@ -1092,7 +1092,7 @@ public class CollUtil { if (null == list || null == filter) { return list; } - final List list2 = (list instanceof LinkedList) ? new LinkedList<>() : new ArrayList<>(list.size()); + final List list2 = (list instanceof LinkedList) ? new LinkedList() : new ArrayList(list.size()); for (T t : list) { if (filter.accept(t)) { list2.add(t); diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index dbc3427bb..0f1500de9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -62,7 +62,7 @@ public class MapUtil { * @since 4.6.3 */ public static Map emptyIfNull(Map set) { - return (null == set) ? Collections.emptyMap() : set; + return (null == set) ? Collections.emptyMap() : set; } /** @@ -105,7 +105,7 @@ public class MapUtil { */ public static HashMap newHashMap(int size, boolean isOrder) { int initialCapacity = (int) (size / DEFAULT_LOAD_FACTOR) + 1; - return isOrder ? new LinkedHashMap<>(initialCapacity) : new HashMap<>(initialCapacity); + return isOrder ? new LinkedHashMap(initialCapacity) : new HashMap(initialCapacity); } /** @@ -775,7 +775,7 @@ public class MapUtil { * @return map创建类 */ public static MapBuilder builder() { - return builder(new HashMap<>()); + return builder(new HashMap()); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java index 95fb71112..879560452 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java @@ -312,7 +312,7 @@ public class NetUtil { return null; } - return CollectionUtil.addAll(new ArrayList<>(), networkInterfaces); + return CollectionUtil.addAll(new ArrayList(), networkInterfaces); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/text/Simhash.java b/hutool-core/src/main/java/cn/hutool/core/text/Simhash.java index 3af834320..1713f475c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/Simhash.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/Simhash.java @@ -57,7 +57,7 @@ public class Simhash { this.hammingThresh = hammingThresh; this.storage = new ArrayList<>(fracCount); for (int i = 0; i < fracCount; i++) { - storage.add(new HashMap<>()); + storage.add(new HashMap>()); } }