From 77424b4ee81a0d5076dedd21d85e8e534af0a29e Mon Sep 17 00:00:00 2001 From: arcade-player Date: Sat, 23 Jul 2022 00:16:39 +0200 Subject: [PATCH] #447 fix ArcadeGraph --- .../arcadedb/structure/ArcadeGraph.java | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java b/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java index 474ddb061a..eea65f4176 100644 --- a/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java +++ b/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java @@ -208,16 +208,9 @@ public Iterator vertices(final Object... vertexIds) { query.append("]"); final ResultSet resultset = this.database.query("sql", query.toString()); - return resultset.stream().map(result -> (Vertex) new ArcadeVertex(this, (com.arcadedb.graph.Vertex) (result.toElement()))).iterator(); - } - -// ElementHelper.validateMixedElementIds(Vertex.class, vertexIds); - if (vertexIds.length > 1) { - final boolean element = Vertex.class.isAssignableFrom(vertexIds[0].getClass()); - for (int i = 1; i < vertexIds.length; i++) { - if (Vertex.class.isAssignableFrom(vertexIds[i].getClass()) != element) - throw new IllegalArgumentException("id arguments must be either ids or Elements"); - } + return resultset.stream() + .map(result -> (Vertex) new ArcadeVertex(this, (com.arcadedb.graph.Vertex) (result.toElement()))) + .iterator(); } final List resultSet = new ArrayList<>(vertexIds.length); @@ -278,20 +271,12 @@ public Iterator edges(final Object... edgeIds) { query.append("]"); final ResultSet resultSet = this.database.query("sql", query.toString()); - return resultSet.stream().map(result -> (Edge) new ArcadeEdge(this, (com.arcadedb.graph.Edge) result.toElement())).iterator(); + return resultSet.stream() + .map(result -> (Edge) new ArcadeEdge(this, (com.arcadedb.graph.Edge) result.toElement())) + .iterator(); } -// ElementHelper.validateMixedElementIds(Vertex.class, edgeIds); - if (edgeIds.length > 1) { - final boolean element = Vertex.class.isAssignableFrom(edgeIds[0].getClass()); - for (int i = 1; i < edgeIds.length; i++) { - if (Vertex.class.isAssignableFrom(edgeIds[i].getClass()) != element) - throw new IllegalArgumentException("id arguments must be either ids or Elements"); - } - } - - final List resultSet = new ArrayList<>(edgeIds.length); for (Object o : edgeIds) {