arangodb#80 minor code improvements

Author: aburmeis

src/main/java/com/arangodb/springframework/core/ArangoOperations.java

@@ -93,23 +93,24 @@ default <T> ArangoCursor<T> query(String query, Map<String, Object> bindVars, Cl
 	}
 
 	/**
-	 * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the
-	 * result list.
+	 * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor}
+	 * instance for the result list.
 	 *
 	 * @param query
 	 *            An AQL query string
-	 * @param options
-	 *            Additional options that will be passed to the query API, can be null
 	 * @param entityClass
 	 *            The entity type of the result
 	 * @return cursor of the results
 	 * @throws DataAccessException
 	 */
-	<T> ArangoCursor<T> query(String query, AqlQueryOptions options, Class<T> entityClass) throws DataAccessException;
+    default <T> ArangoCursor<T> query(String query, AqlQueryOptions options, Class<T> entityClass)
+            throws DataAccessException {
+        return query(query, null, options, entityClass);
+    }
 
 	/**
-	 * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the
-	 * result list.
+	 * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor}
+	 * instance for the result list.
 	 *
 	 * @param query
 	 *            An AQL query string

src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java

@@ -283,12 +283,6 @@ public DbName getDatabaseName() {
 				: databaseName);
 	}
 
-    @Override
-    public <T> ArangoCursor<T> query(final String query, final AqlQueryOptions options, final Class<T> entityClass)
-            throws DataAccessException {
-        return query(query, null, options, entityClass);
-    }
-
     @Override
     public <T> ArangoCursor<T> query(final String query, final Map<String, Object> bindVars,
                                      final AqlQueryOptions options, final Class<T> entityClass) throws DataAccessException {

src/main/java/com/arangodb/springframework/repository/query/AbstractArangoQuery.java

@@ -78,16 +78,16 @@ public Object execute(final Object[] parameters) {
 			options.fullCount(true);
 		}
 
-		final QueryWithCollections queryAndCollection = createQuery(accessor, bindVars, options);
+		final QueryWithCollections query = createQuery(accessor, bindVars, options);
 		if (options.getStreamTransactionId() == null && transactionBridge != null) {
-			options.streamTransactionId(transactionBridge.getCurrentTransaction(queryAndCollection.getCollections()));
+			options.streamTransactionId(transactionBridge.getCurrentTransaction(query.getCollections()));
 		}
 
 
 		final ResultProcessor processor = method.getResultProcessor().withDynamicProjection(accessor);
 		final Class<?> typeToRead = getTypeToRead(processor);
 
-		final ArangoCursor<?> result = operations.query(queryAndCollection.getQuery(), bindVars, options, typeToRead);
+		final ArangoCursor<?> result = operations.query(query.getQuery(), bindVars, options, typeToRead);
 		logWarningsIfNecessary(result);
 		return processor.processResult(convertResult(result, accessor));
 	}