Merge pull request #18 from ralscha/master

Achim Brandt · Achim Brandt · commit 22304f67d083 · 2015-06-26T17:47:47.000+02:00
Remove dependency on commons-collections4
diff --git a/pom.xml b/pom.xml
@@ -207,11 +207,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>
-			<version>${commons-collections4.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
diff --git a/src/main/java/com/arangodb/impl/InternalGraphDriverImpl.java b/src/main/java/com/arangodb/impl/InternalGraphDriverImpl.java
@@ -22,8 +22,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.arangodb.ArangoConfigure;
 import com.arangodb.ArangoDriver;
 import com.arangodb.ArangoException;
@@ -41,6 +39,7 @@
 import com.arangodb.entity.marker.VertexEntity;
 import com.arangodb.http.HttpManager;
 import com.arangodb.http.HttpResponseEntity;
+import com.arangodb.util.CollectionUtils;
 import com.arangodb.util.MapBuilder;
 import com.arangodb.util.StringUtils;
 import com.google.gson.JsonElement;
diff --git a/src/main/java/com/arangodb/util/CollectionUtils.java b/src/main/java/com/arangodb/util/CollectionUtils.java
@@ -77,4 +77,8 @@ public static <T> String join(T[] array, String separator) {
     return buffer.toString();
   }
   
+  public static boolean isNotEmpty(final Collection<?> coll) {
+    return coll != null && !coll.isEmpty();
+  }
+  
 }
diff --git a/src/main/java/com/arangodb/util/GraphEdgesOptions.java b/src/main/java/com/arangodb/util/GraphEdgesOptions.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.arangodb.Direction;
 
 public class GraphEdgesOptions implements OptionsInterface {
diff --git a/src/main/java/com/arangodb/util/GraphVerticesOptions.java b/src/main/java/com/arangodb/util/GraphVerticesOptions.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.arangodb.Direction;
 
 public class GraphVerticesOptions implements OptionsInterface {
diff --git a/src/main/java/com/arangodb/util/ShortestPathOptions.java b/src/main/java/com/arangodb/util/ShortestPathOptions.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.arangodb.Direction;
 
 public class ShortestPathOptions implements OptionsInterface {

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,8 @@ public static <T> String join(T[] array, String separator) {`
`77`	`77`	`return buffer.toString();`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ public static boolean isNotEmpty(final Collection<?> coll) {`
	`81`	`+ return coll != null && !coll.isEmpty();`
	`82`	`+ }`
	`83`	`+`
`80`	`84`	`}`