code analysis fixes

michele · michele · commit f932146eae0c · 2019-09-04T14:52:44.000+02:00
diff --git a/README.md b/README.md
@@ -21,5 +21,5 @@ The following documentation links to the documentation of the synchronous varian
 
 - [ArangoDB](https://www.arangodb.com/)
 - [ChangeLog](ChangeLog.md)
-- [Examples](src/test/java/com/arangodb/example)
+- [Examples](src/test/java/com/arangodb/async/example)
 - [JavaDoc](http://arangodb.github.io/arangodb-java-driver-async/javadoc-5_1)
diff --git a/src/main/java/com/arangodb/async/ArangoCollectionAsync.java b/src/main/java/com/arangodb/async/ArangoCollectionAsync.java
@@ -35,21 +35,22 @@
  * @see <a href="https://docs.arangodb.com/current/HTTP/Collection/">Documents API Documentation</a>
  * @author Mark Vollmary
  */
+@SuppressWarnings("unused")
 public interface ArangoCollectionAsync extends ArangoSerializationAccessor {
 
 	/**
 	 * The the handler of the database the collection is within
 	 * 
 	 * @return database handler
 	 */
-	public ArangoDatabaseAsync db();
+	ArangoDatabaseAsync db();
 
 	/**
 	 * The name of the collection
 	 * 
 	 * @return collection name
 	 */
-	public String name();
+	String name();
 
 	/**
 	 * Creates a new document from the given document, unless there is already a document with the _key given. If no
@@ -338,9 +339,6 @@ <T> CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<T>>> updateDocume
 	 *      Documentation</a>
 	 * @param key
 	 *            The key of the document
-	 * @param type
-	 *            The type of the document (POJO class, VPackSlice or String for Json). Only necessary if
-	 *            options.returnOld is set to true, otherwise can be null.
 	 * @return information about the document
 	 */
 	CompletableFuture<DocumentDeleteEntity<Void>> deleteDocument(final String key);
@@ -372,9 +370,6 @@ <T> CompletableFuture<DocumentDeleteEntity<T>> deleteDocument(
 	 *      Documentation</a>
 	 * @param values
 	 *            The keys of the documents or the documents themselves
-	 * @param type
-	 *            The type of the documents (POJO class, VPackSlice or String for Json). Only necessary if
-	 *            options.returnOld is set to true, otherwise can be null.
 	 * @return information about the documents
 	 */
 	CompletableFuture<MultiDocumentEntity<DocumentDeleteEntity<Void>>> deleteDocuments(final Collection<?> values);
@@ -586,8 +581,6 @@ CompletableFuture<IndexEntity> ensureFulltextIndex(
 	 * 
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Collection/Creating.html#create-collection">API
 	 *      Documentation</a>
-	 * @param options
-	 *            Additional options, can be null
 	 * @return information about the collection
 	 */
 	CompletableFuture<CollectionEntity> create();
diff --git a/src/main/java/com/arangodb/async/ArangoDBAsync.java b/src/main/java/com/arangodb/async/ArangoDBAsync.java
@@ -75,7 +75,8 @@ public interface ArangoDBAsync extends ArangoSerializationAccessor {
 	 * 
 	 * @author Mark Vollmary
 	 */
-	public static class Builder extends InternalArangoDBBuilder {
+	@SuppressWarnings("unused")
+	class Builder extends InternalArangoDBBuilder {
 
 		public Builder() {
 			super();
@@ -483,8 +484,8 @@ public Builder registerJsonModule(final VPackParserModule module) {
 		 *            modules to register
 		 * @return {@link ArangoDBAsync.Builder}
 		 */
-		public Builder registerJsonModules(final VPackParserModule... module) {
-			vpackParserBuilder.registerModules(module);
+		public Builder registerJsonModules(final VPackParserModule... modules) {
+			vpackParserBuilder.registerModules(modules);
 			return this;
 		}
 
diff --git a/src/main/java/com/arangodb/async/ArangoDatabaseAsync.java b/src/main/java/com/arangodb/async/ArangoDatabaseAsync.java
@@ -39,6 +39,7 @@
  * @see <a href="https://docs.arangodb.com/current/HTTP/Database/">Databases API Documentation</a>
  * @see <a href="https://docs.arangodb.com/current/HTTP/AqlQuery/">Query API Documentation</a>
  */
+@SuppressWarnings("unused")
 public interface ArangoDatabaseAsync extends ArangoSerializationAccessor {
 
     /**
@@ -102,7 +103,6 @@ public interface ArangoDatabaseAsync extends ArangoSerializationAccessor {
      * Creates a collection
      *
      * @param name    The name of the collection
-     * @param options Additional options, can be null
      * @return information about the collection
      * @see <a href="https://docs.arangodb.com/current/HTTP/Collection/Creating.html#create-collection">API
      * Documentation</a>
diff --git a/src/main/java/com/arangodb/async/ArangoEdgeCollectionAsync.java b/src/main/java/com/arangodb/async/ArangoEdgeCollectionAsync.java
@@ -33,6 +33,7 @@
  * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html">API Documentation</a>
  * @author Mark Vollmary
  */
+@SuppressWarnings("unused")
 public interface ArangoEdgeCollectionAsync extends ArangoSerializationAccessor {
 
 	/**
@@ -104,8 +105,6 @@ public interface ArangoEdgeCollectionAsync extends ArangoSerializationAccessor {
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html#replace-an-edge">API Documentation</a>
 	 * @param key
 	 *            The key of the edge
-	 * @param type
-	 *            The type of the edge-document (POJO class, VPackSlice or String for Json)
 	 * @return information about the edge
 	 */
 	<T> CompletableFuture<EdgeUpdateEntity> replaceEdge(final String key, final T value);
@@ -117,8 +116,6 @@ public interface ArangoEdgeCollectionAsync extends ArangoSerializationAccessor {
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html#replace-an-edge">API Documentation</a>
 	 * @param key
 	 *            The key of the edge
-	 * @param type
-	 *            The type of the edge-document (POJO class, VPackSlice or String for Json)
 	 * @param options
 	 *            Additional options, can be null
 	 * @return information about the edge
@@ -136,8 +133,6 @@ <T> CompletableFuture<EdgeUpdateEntity> replaceEdge(
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html#modify-an-edge">API Documentation</a>
 	 * @param key
 	 *            The key of the edge
-	 * @param type
-	 *            The type of the edge-document (POJO class, VPackSlice or String for Json)
 	 * @return information about the edge
 	 */
 	<T> CompletableFuture<EdgeUpdateEntity> updateEdge(final String key, final T value);
@@ -150,8 +145,6 @@ <T> CompletableFuture<EdgeUpdateEntity> replaceEdge(
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html#modify-an-edge">API Documentation</a>
 	 * @param key
 	 *            The key of the edge
-	 * @param type
-	 *            The type of the edge-document (POJO class, VPackSlice or String for Json)
 	 * @param options
 	 *            Additional options, can be null
 	 * @return information about the edge
diff --git a/src/main/java/com/arangodb/async/ArangoGraphAsync.java b/src/main/java/com/arangodb/async/ArangoGraphAsync.java
@@ -34,21 +34,22 @@
  * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/">API Documentation</a>
  * @author Mark Vollmary
  */
+@SuppressWarnings("unused")
 public interface ArangoGraphAsync extends ArangoSerializationAccessor {
 
 	/**
 	 * The the handler of the database the named graph is within
 	 * 
 	 * @return database handler
 	 */
-	public ArangoDatabaseAsync db();
+	ArangoDatabaseAsync db();
 
 	/**
 	 * The name of the collection
 	 * 
 	 * @return collection name
 	 */
-	public String name();
+	String name();
 
 	/**
 	 * Checks whether the graph exists
@@ -102,7 +103,7 @@ CompletableFuture<GraphEntity> createGraph(
 	 *            graphs.
 	 * @return void
 	 */
-	CompletableFuture<Void> drop(boolean dropCollection);
+	CompletableFuture<Void> drop(boolean dropCollections);
 
 	/**
 	 * Get a graph from the graph module
diff --git a/src/main/java/com/arangodb/async/ArangoRouteAsync.java b/src/main/java/com/arangodb/async/ArangoRouteAsync.java
@@ -31,6 +31,7 @@
  * 
  * @author Mark Vollmary
  */
+@SuppressWarnings("unused")
 public interface ArangoRouteAsync extends ArangoSerializationAccessor {
 
 	/**
diff --git a/src/main/java/com/arangodb/async/ArangoVertexCollectionAsync.java b/src/main/java/com/arangodb/async/ArangoVertexCollectionAsync.java
@@ -33,6 +33,7 @@
  * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Vertices.html">API Documentation</a>
  * @author Mark Vollmary
  */
+@SuppressWarnings("unused")
 public interface ArangoVertexCollectionAsync extends ArangoSerializationAccessor {
 
 	/**
@@ -115,8 +116,6 @@ public interface ArangoVertexCollectionAsync extends ArangoSerializationAccessor
 	 *      Documentation</a>
 	 * @param key
 	 *            The key of the vertex
-	 * @param type
-	 *            The type of the vertex-document (POJO class, VPackSlice or String for Json)
 	 * @return information about the vertex
 	 */
 	<T> CompletableFuture<VertexUpdateEntity> replaceVertex(final String key, final T value);
@@ -129,8 +128,6 @@ public interface ArangoVertexCollectionAsync extends ArangoSerializationAccessor
 	 *      Documentation</a>
 	 * @param key
 	 *            The key of the vertex
-	 * @param type
-	 *            The type of the vertex-document (POJO class, VPackSlice or String for Json)
 	 * @param options
 	 *            Additional options, can be null
 	 * @return information about the vertex
@@ -148,8 +145,6 @@ <T> CompletableFuture<VertexUpdateEntity> replaceVertex(
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Vertices.html#modify-a-vertex">API Documentation</a>
 	 * @param key
 	 *            The key of the vertex
-	 * @param type
-	 *            The type of the vertex-document (POJO class, VPackSlice or String for Json)
 	 * @return information about the vertex
 	 */
 	<T> CompletableFuture<VertexUpdateEntity> updateVertex(final String key, final T value);
@@ -162,8 +157,6 @@ <T> CompletableFuture<VertexUpdateEntity> replaceVertex(
 	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Vertices.html#modify-a-vertex">API Documentation</a>
 	 * @param key
 	 *            The key of the vertex
-	 * @param type
-	 *            The type of the vertex-document (POJO class, VPackSlice or String for Json)
 	 * @param options
 	 *            Additional options, can be null
 	 * @return information about the vertex
diff --git a/src/main/java/com/arangodb/async/ArangoViewAsync.java b/src/main/java/com/arangodb/async/ArangoViewAsync.java
@@ -32,21 +32,22 @@
  * @author Mark Vollmary
  * @since ArangoDB 3.4.0
  */
+@SuppressWarnings("unused")
 public interface ArangoViewAsync extends ArangoSerializationAccessor {
 
 	/**
 	 * The the handler of the database the collection is within
 	 * 
 	 * @return database handler
 	 */
-	public ArangoDatabaseAsync db();
+	ArangoDatabaseAsync db();
 
 	/**
 	 * The name of the view
 	 * 
 	 * @return view name
 	 */
-	public String name();
+	String name();
 
 	/**
 	 * Checks whether the view exists.
diff --git a/src/main/java/com/arangodb/async/internal/ArangoCollectionAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoCollectionAsyncImpl.java
@@ -41,7 +41,7 @@ public class ArangoCollectionAsyncImpl
         extends InternalArangoCollection<ArangoDBAsyncImpl, ArangoDatabaseAsyncImpl, ArangoExecutorAsync>
         implements ArangoCollectionAsync {
 
-    protected ArangoCollectionAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {
+    ArangoCollectionAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {
         super(db, name);
     }
 
@@ -319,7 +319,7 @@ public CompletableFuture<Collection<IndexEntity>> getIndexes() {
 
     @Override
     public CompletableFuture<Boolean> exists() {
-        return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null);
+        return getInfo().thenApply(Objects::nonNull).exceptionally(Objects::isNull);
     }
 
     @Override
diff --git a/src/main/java/com/arangodb/async/internal/ArangoCursorAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoCursorAsyncImpl.java
@@ -36,8 +36,8 @@
  */
 public class ArangoCursorAsyncImpl<T> extends ArangoCursorImpl<T> implements ArangoCursorAsync<T> {
 
-	protected ArangoCursorAsyncImpl(final InternalArangoDatabase<?, ?> db, final ArangoCursorExecute execute,
-									final Class<T> type, final CursorEntity result) {
+	ArangoCursorAsyncImpl(final InternalArangoDatabase<?, ?> db, final ArangoCursorExecute execute,
+						  final Class<T> type, final CursorEntity result) {
 		super(db, execute, type, result);
 	}
 
diff --git a/src/main/java/com/arangodb/async/internal/ArangoDatabaseAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoDatabaseAsyncImpl.java
@@ -37,6 +37,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -47,7 +48,7 @@
 public class ArangoDatabaseAsyncImpl extends InternalArangoDatabase<ArangoDBAsyncImpl, ArangoExecutorAsync>
         implements ArangoDatabaseAsync {
 
-    protected ArangoDatabaseAsyncImpl(final ArangoDBAsyncImpl arangoDB, final String name) {
+    ArangoDatabaseAsyncImpl(final ArangoDBAsyncImpl arangoDB, final String name) {
         super(arangoDB, name);
     }
 
@@ -63,7 +64,7 @@ public CompletableFuture<ArangoDBEngine> getEngine() {
 
     @Override
     public CompletableFuture<Boolean> exists() {
-        return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null);
+        return getInfo().thenApply(Objects::nonNull).exceptionally(Objects::isNull);
     }
 
     @Override
@@ -397,7 +398,7 @@ public CompletableFuture<Void> reloadRouting() {
 
     @Override
     public ArangoRouteAsync route(final String... path) {
-        return new ArangoRouteAsyncImpl(this, createPath(path), Collections.<String, String>emptyMap());
+        return new ArangoRouteAsyncImpl(this, createPath(path), Collections.emptyMap());
     }
 
     @Override
diff --git a/src/main/java/com/arangodb/async/internal/ArangoEdgeCollectionAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoEdgeCollectionAsyncImpl.java
@@ -36,7 +36,7 @@ public class ArangoEdgeCollectionAsyncImpl extends
 		InternalArangoEdgeCollection<ArangoDBAsyncImpl, ArangoDatabaseAsyncImpl, ArangoGraphAsyncImpl, ArangoExecutorAsync>
 		implements ArangoEdgeCollectionAsync {
 
-	protected ArangoEdgeCollectionAsyncImpl(final ArangoGraphAsyncImpl graph, final String name) {
+	ArangoEdgeCollectionAsyncImpl(final ArangoGraphAsyncImpl graph, final String name) {
 		super(graph, name);
 	}
 
diff --git a/src/main/java/com/arangodb/async/internal/ArangoExecutorAsync.java b/src/main/java/com/arangodb/async/internal/ArangoExecutorAsync.java
@@ -60,7 +60,7 @@ public <T> CompletableFuture<T> execute(final Request request, final ResponseDes
         return execute(request, responseDeserializer, null);
     }
 
-    public <T> CompletableFuture<T> execute(
+    private <T> CompletableFuture<T> execute(
             final Request request,
             final ResponseDeserializer<T> responseDeserializer,
             final HostHandle hostHandle) {
diff --git a/src/main/java/com/arangodb/async/internal/ArangoGraphAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoGraphAsyncImpl.java
@@ -29,6 +29,7 @@
 import com.arangodb.model.GraphCreateOptions;
 
 import java.util.Collection;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -39,13 +40,13 @@ public class ArangoGraphAsyncImpl
 		extends InternalArangoGraph<ArangoDBAsyncImpl, ArangoDatabaseAsyncImpl, ArangoExecutorAsync>
 		implements ArangoGraphAsync {
 
-	protected ArangoGraphAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {
+	ArangoGraphAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {
 		super(db, name);
 	}
 
 	@Override
 	public CompletableFuture<Boolean> exists() {
-		return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null);
+		return getInfo().thenApply(Objects::nonNull).exceptionally(Objects::isNull);
 	}
 
 	@Override
@@ -66,8 +67,8 @@ public CompletableFuture<Void> drop() {
 	}
 
 	@Override
-	public CompletableFuture<Void> drop(boolean dropCollection) {
-		return executor.execute(dropRequest(dropCollection), Void.class);
+	public CompletableFuture<Void> drop(boolean dropCollections) {
+		return executor.execute(dropRequest(dropCollections), Void.class);
 	}
 
 	@Override
diff --git a/src/main/java/com/arangodb/async/internal/ArangoRouteAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoRouteAsyncImpl.java
diff --git a/src/main/java/com/arangodb/async/internal/ArangoSearchAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoSearchAsyncImpl.java
diff --git a/src/main/java/com/arangodb/async/internal/ArangoVertexCollectionAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoVertexCollectionAsyncImpl.java
diff --git a/src/main/java/com/arangodb/async/internal/ArangoViewAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoViewAsyncImpl.java
diff --git a/src/main/java/com/arangodb/async/internal/velocystream/VstConnectionAsync.java b/src/main/java/com/arangodb/async/internal/velocystream/VstConnectionAsync.java

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`* @author Mark Vollmary`
`33`	`33`	`*/`
	`34`	`+@SuppressWarnings("unused")`
`34`	`35`	`public interface ArangoRouteAsync extends ArangoSerializationAccessor {`
`35`	`36`
`36`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class ArangoCollectionAsyncImpl`
`41`	`41`	`extends InternalArangoCollection<ArangoDBAsyncImpl, ArangoDatabaseAsyncImpl, ArangoExecutorAsync>`
`42`	`42`	`implements ArangoCollectionAsync {`
`43`	`43`
`44`		`- protected ArangoCollectionAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {`
	`44`	`+ ArangoCollectionAsyncImpl(final ArangoDatabaseAsyncImpl db, final String name) {`
`45`	`45`	`super(db, name);`
`46`	`46`	`}`
`47`	`47`
`@@ -319,7 +319,7 @@ public CompletableFuture<Collection<IndexEntity>> getIndexes() {`
`319`	`319`
`320`	`320`	`@Override`
`321`	`321`	`public CompletableFuture<Boolean> exists() {`
`322`		`- return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null);`
	`322`	`+ return getInfo().thenApply(Objects::nonNull).exceptionally(Objects::isNull);`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`@Override`