diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CollectionUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CollectionUtils.java index 875b124..62bc92e 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CollectionUtils.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CollectionUtils.java @@ -19,10 +19,6 @@ package org.apache.hadoop.hbase.util; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; @@ -32,80 +28,7 @@ import org.apache.yetus.audience.InterfaceAudience; * Utility methods for dealing with Collections, including treating null collections as empty. */ @InterfaceAudience.Private -public class CollectionUtils { - - private static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0)); - - - @SuppressWarnings("unchecked") - public static Collection nullSafe(Collection in) { - if (in == null) { - return (Collection)EMPTY_LIST; - } - return in; - } - - /************************ size ************************************/ - - public static int nullSafeSize(Collection collection) { - if (collection == null) { - return 0; - } - return collection.size(); - } - - public static boolean nullSafeSameSize(Collection a, Collection b) { - return nullSafeSize(a) == nullSafeSize(b); - } - - /*************************** empty ****************************************/ - - public static boolean isEmpty(Collection collection) { - return collection == null || collection.isEmpty(); - } - - public static boolean notEmpty(Collection collection) { - return !isEmpty(collection); - } - - /************************ first/last **************************/ - - public static T getFirst(Collection collection) { - if (CollectionUtils.isEmpty(collection)) { - return null; - } - for (T t : collection) { - return t; - } - return null; - } - - /** - * @param list any list - * @return -1 if list is empty, otherwise the max index - */ - public static int getLastIndex(List list){ - if(isEmpty(list)){ - return -1; - } - return list.size() - 1; - } - - /** - * @param list - * @param index the index in question - * @return true if it is the last index or if list is empty and -1 is passed for the index param - */ - public static boolean isLastIndex(List list, int index){ - return index == getLastIndex(list); - } - - public static T getLast(List list) { - if (isEmpty(list)) { - return null; - } - return list.get(list.size() - 1); - } +public class CollectionUtils extends org.apache.commons.collections.CollectionUtils { /** * In HBASE-16648 we found that ConcurrentHashMap.get is much faster than computeIfAbsent if the