Skip to content

#447: update to gremlin 3.6.0 #457

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
mergify merged 1 commit into from
Jul 14, 2022
Merged

#447: update to gremlin 3.6.0 #457

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<packaging>jar</packaging>

<properties>
<gremlin.version>3.5.2</gremlin.version>
<gremlin.version>3.6.0</gremlin.version>
<translation.version>1.0.4</translation.version>
</properties>

Expand Down
19 changes: 17 additions & 2 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 @@ -211,7 +211,14 @@ public Iterator<Vertex> vertices(final Object... vertexIds) {
return resultset.stream().map(result -> (Vertex) new ArcadeVertex(this, (com.arcadedb.graph.Vertex) (result.toElement()))).iterator();
}

ElementHelper.validateMixedElementIds(Vertex.class, vertexIds);
// 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");
}
}

final List<Vertex> resultSet = new ArrayList<>(vertexIds.length);

Expand Down Expand Up @@ -275,7 +282,15 @@ public Iterator<Edge> edges(final Object... edgeIds) {

}

ElementHelper.validateMixedElementIds(Vertex.class, edgeIds);
// 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);

Expand Down
2 changes: 1 addition & 1 deletion gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/GremlinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public void sort() throws ExecutionException, InterruptedException {
alice.addEdge("FriendOf", steve);
steve.addEdge("FriendOf", bob);

final ArcadeGremlin gremlinReadOnly = graph.gremlin("g.E().order().by('name', asc)");
final ArcadeGremlin gremlinReadOnly = graph.gremlin("g.V().order().by('name', asc)");
final ResultSet result = gremlinReadOnly.execute();

Assertions.assertTrue(result.hasNext());
Expand Down