Merge branch 'graphprovider-clear-tp33' into graphprovider-clear-master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1d9a17e0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1d9a17e0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1d9a17e0 Branch: refs/heads/master Commit: 1d9a17e031b0a653ff72800d1c15e058064521f6 Parents: a085355 6efd47d Author: Justin Chu <15710241+justinch...@users.noreply.github.com> Authored: Tue Aug 21 18:33:04 2018 -0400 Committer: Justin Chu <15710241+justinch...@users.noreply.github.com> Committed: Tue Aug 21 18:33:04 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++--- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +++++++++--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java ---------------------------------------------------------------------- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java index 6a2b700,a614252..aaa9da2 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java @@@ -41,11 -39,8 +40,9 @@@ import java.lang.reflect.InvocationTarg import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; - import java.util.HashMap; import java.util.HashSet; import java.util.List; - import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java ----------------------------------------------------------------------