From 4d6c421358788fc04c69a8f58ff1f53ce8563e61 Mon Sep 17 00:00:00 2001 From: Zhangmei Li Date: Fri, 25 Aug 2017 11:12:42 +0800 Subject: [PATCH] HugeGraph-726: add toList(array) method into class CollectionUtil Change-Id: Ia8a06f002e66f11935986284f587563ebc0c2257 --- pom.xml | 4 ++-- .../com/baidu/hugegraph/util/CheckSocket.java | 2 +- .../baidu/hugegraph/util/CollectionUtil.java | 21 ++++++++++++++++--- src/main/java/com/baidu/hugegraph/util/E.java | 3 --- .../com/baidu/hugegraph/util/HashUtil.java | 3 --- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 375ba028d..795d0001a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.baidu.hugegraph hugegraph-common - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT @@ -154,7 +154,7 @@ - 1.3.0.0 + 1.3.1.0 diff --git a/src/main/java/com/baidu/hugegraph/util/CheckSocket.java b/src/main/java/com/baidu/hugegraph/util/CheckSocket.java index 17aded4ae..961c42a8a 100644 --- a/src/main/java/com/baidu/hugegraph/util/CheckSocket.java +++ b/src/main/java/com/baidu/hugegraph/util/CheckSocket.java @@ -34,7 +34,7 @@ public final class CheckSocket { private static final int E_USAGE = 1; private static final int E_FAILED = 2; private static final String MSG_USAGE = - "Usage: " + CheckSocket.class.getSimpleName() + " hostname port"; + "Usage: " + CheckSocket.class.getSimpleName() + " hostname port"; public static void main(String args[]) { if (args.length != 2) { diff --git a/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java b/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java index 9e983d149..331d29cda 100644 --- a/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java +++ b/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java @@ -19,15 +19,30 @@ package com.baidu.hugegraph.util; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; -/** - * Created by liningrui on 2017/3/30. - */ public final class CollectionUtil { @SuppressWarnings({ "unchecked", "rawtypes" }) public static boolean containsAll(Collection a, Collection b) { return a.containsAll(b); } + + @SuppressWarnings("unchecked") + public static List toList(Object array) { + E.checkNotNull(array, "array"); + E.checkArgument(array.getClass().isArray(), + "The parameter of toList() must be an array: '%s'", + array.getClass().getSimpleName()); + + int length = Array.getLength(array); + List list = new ArrayList<>(length); + for (int i = 0; i < length; i++) { + list.add((T) Array.get(array, i)); + } + return list; + } } diff --git a/src/main/java/com/baidu/hugegraph/util/E.java b/src/main/java/com/baidu/hugegraph/util/E.java index 727b7fd49..340b7bc7a 100644 --- a/src/main/java/com/baidu/hugegraph/util/E.java +++ b/src/main/java/com/baidu/hugegraph/util/E.java @@ -25,9 +25,6 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; -/** - * Created by liningrui on 2017/5/26. - */ public final class E { public static void checkNotNull(Object object, String elem) { diff --git a/src/main/java/com/baidu/hugegraph/util/HashUtil.java b/src/main/java/com/baidu/hugegraph/util/HashUtil.java index bdb29f552..3a39eb3d4 100644 --- a/src/main/java/com/baidu/hugegraph/util/HashUtil.java +++ b/src/main/java/com/baidu/hugegraph/util/HashUtil.java @@ -23,9 +23,6 @@ import java.nio.charset.Charset; import com.google.common.hash.Hashing; -/** - * Created by jishilei on 2017/3/26. - */ public final class HashUtil { public static byte[] hash(byte[] bytes) {