Skip to content

#447 fix ArcadeGraph #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arcade-player merged 1 commit into from
Jul 22, 2022
Merged

#447 fix ArcadeGraph #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,9 @@ public Iterator<Vertex> 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<Vertex> resultSet = new ArrayList<>(vertexIds.length);
Expand Down Expand Up @@ -278,20 +271,12 @@ public Iterator<Edge> 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<Edge> resultSet = new ArrayList<>(edgeIds.length);

for (Object o : edgeIds) {
Expand Down