wildcard generic type in AQL bindVars

Author: rashtao

pom.xml

@@ -29,7 +29,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <arangodb-java-driver.version>7.21.0</arangodb-java-driver.version>
+        <arangodb-java-driver.version>7.22.0-SNAPSHOT</arangodb-java-driver.version>
         <test.graph.type>simple</test.graph.type>
         <jpms.argLine/>
     </properties>

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBGraphClient.java

@@ -191,16 +191,16 @@ public ArangoDB getArangoDriver() {
         return db.arango();
     }
 
-    public Iterator<Object> query(final String query, final Map<String, Object> parameters, final AqlQueryOptions options) {
+    public Iterator<Object> query(final String query, final Map<String, ?> parameters, final AqlQueryOptions options) {
         Iterator<JsonNode> res = query(query, JsonNode.class, parameters, options);
         return IteratorUtils.map(res, aqlDeserializer::deserialize);
     }
 
-    private <V> ArangoCursor<V> query(String query, Class<V> type, Map<String, Object> parameters) {
+    private <V> ArangoCursor<V> query(String query, Class<V> type, Map<String, ?> parameters) {
         return query(query, type, parameters, new AqlQueryOptions());
     }
 
-    private <V> ArangoCursor<V> query(String query, Class<V> type, Map<String, Object> parameters, AqlQueryOptions options) {
+    private <V> ArangoCursor<V> query(String query, Class<V> type, Map<String, ?> parameters, AqlQueryOptions options) {
         logger.debug("Executing AQL query: {}, with parameters: {}, with options: {}", query, parameters, options);
         try {
             return db.query(query, type, parameters, options);

src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraph.java

@@ -243,7 +243,7 @@ public <E> GraphTraversal<?, E> aql(final String query, final AqlQueryOptions op
      * @param parameters the parameters of the AQL query
      * @return a fluent Gremlin traversal
      */
-    public <E> GraphTraversal<?, E> aql(final String query, final Map<String, Object> parameters) {
+    public <E> GraphTraversal<?, E> aql(final String query, final Map<String, ?> parameters) {
         return aql(query, parameters, new AqlQueryOptions());
     }
 
@@ -255,7 +255,7 @@ public <E> GraphTraversal<?, E> aql(final String query, final Map<String, Object
      * @param options    query options
      * @return a fluent Gremlin traversal
      */
-    public <E> GraphTraversal<?, E> aql(final String query, final Map<String, Object> parameters, final AqlQueryOptions options) {
+    public <E> GraphTraversal<?, E> aql(final String query, final Map<String, ?> parameters, final AqlQueryOptions options) {
         GraphTraversal.Admin<?, E> traversal = new DefaultGraphTraversal<>(this);
         traversal.addStep(new AQLStartStep(traversal, query, client.query(query, parameters, options)));
         return traversal;

src/test/java/com/arangodb/tinkerpop/gremlin/arangodb/simple/AqlTest.java

@@ -18,6 +18,7 @@
 
 import com.arangodb.ArangoDBException;
 import com.arangodb.model.AqlQueryOptions;
+import com.arangodb.tinkerpop.gremlin.persistence.ElementId;
 import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
@@ -55,7 +56,7 @@ private String edgeCollection() {
     public void shouldExecuteAqlWithArgs() {
         this.graph.addVertex("name", "marko");
         String query = "FOR d IN @@vCol FILTER d.name == @name RETURN d";
-        Map<String, Object> bindings = new HashMap<>();
+        Map<String, String> bindings = new HashMap<>();
         bindings.put("@vCol", vertexCollection());
         bindings.put("name", "marko");
         Iterator<String> result = graph().aql(query, bindings).values("name");
@@ -89,7 +90,7 @@ public void shouldReadVertex() {
     public void shouldReadNestedVertices() {
         Vertex a = graph.addVertex("name", "marko");
         Vertex b = graph.addVertex("name", "vadas");
-        Map<String, Object> params = new HashMap<>();
+        Map<String, ElementId> params = new HashMap<>();
         params.put("a", graph().elementId(a));
         params.put("b", graph().elementId(b));
         Map<String, Vertex> result = graph().<Map<String, Vertex>>aql(
@@ -105,7 +106,7 @@ public void shouldReadNestedVertices() {
     public void shouldReadArrayOfVertices() {
         Vertex a = graph.addVertex("name", "marko");
         Vertex b = graph.addVertex("name", "vadas");
-        Map<String, Object> params = new HashMap<>();
+        Map<String, ElementId> params = new HashMap<>();
         params.put("a", graph().elementId(a));
         params.put("b", graph().elementId(b));
         List<Vertex> result = graph().<List<Vertex>>aql(
@@ -166,7 +167,7 @@ public void shouldExecuteAqlAndBackToGremlin() {
         this.graph.addVertex("name", "marko", "age", 29, "color", "red");
         this.graph.addVertex("name", "marko", "age", 30, "color", "yellow");
         String query = "FOR d IN @@vCol FILTER d.name == @name RETURN d";
-        Map<String, Object> bindings = new HashMap<>();
+        Map<String, String> bindings = new HashMap<>();
         bindings.put("@vCol", vertexCollection());
         bindings.put("name", "marko");
         Traversal<?, ?> result = graph().aql(query, bindings).has("age", 29).values("color");