Now that graphson 3.0 is defaulted tested needed some cleanup CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1d3e9a1d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1d3e9a1d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1d3e9a1d Branch: refs/heads/TINKERPOP-1698 Commit: 1d3e9a1d81cae9f6b30ce4f2db3680028bce71ac Parents: 4540cd4 Author: Stephen Mallette <[email protected]> Authored: Wed Jun 28 15:09:12 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Jun 28 15:09:12 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/tinkerpop/gremlin/server/Settings.java | 2 +- .../gremlin/server/GremlinServerHttpIntegrateTest.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d3e9a1d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java index cb3ee2b..cbb930b 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java @@ -379,7 +379,7 @@ public class Settings { * A {@link Map} containing {@link MessageSerializer} specific configurations. Consult the * {@link MessageSerializer} implementation for specifics on what configurations are expected. */ - public Map<String, Object> config = null; + public Map<String, Object> config = Collections.emptyMap(); } /** http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d3e9a1d/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java index 6a94c72..ec878de 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java @@ -586,11 +586,8 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra final JsonNode data = resultJson.get("result").get("data"); assertEquals(1, data.size()); - final List<JsonNode> vertices = data.get(0).findValues(GraphSONTokens.VERTICES); - final List<JsonNode> edges = data.get(0).findValues(GraphSONTokens.EDGES); - - assertEquals(6, vertices.get(0).size()); - assertEquals(6, edges.get(0).size()); + assertEquals(6, data.get(0).get(GraphSONTokens.VERTICES).get(1).size()); + assertEquals(6, data.get(0).get(GraphSONTokens.EDGES).get(1).size()); } }
