TINKERPOP-1913 Corrected status attributes messages after rebase Test graphs are now named differently given the refactoring that went into improving integration configurations. Also fixed a bug in NO_CONTENT messages and added a test.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/24e08d2b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/24e08d2b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/24e08d2b Branch: refs/heads/TINKERPOP-1913 Commit: 24e08d2b99d77ae634576acc6cd0c4061d1b0bac Parents: 60883a1 Author: Stephen Mallette <[email protected]> Authored: Thu Aug 16 08:08:11 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue Sep 18 12:58:42 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/server/op/AbstractOpProcessor.java | 1 + .../gremlin/server/GremlinResultSetIntegrateTest.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24e08d2b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java index 767445a..cdbb706 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java @@ -99,6 +99,7 @@ public abstract class AbstractOpProcessor implements OpProcessor { if (managedTransactionsForRequest) attemptCommit(msg, context.getGraphManager(), settings.strictTransactionManagement); rhc.writeAndFlush(ResponseMessage.build(msg) .code(ResponseStatusCode.NO_CONTENT) + .statusAttributes(generateStatusAttributes(ctx, msg, ResponseStatusCode.NO_CONTENT, itty, settings)) .create()); return; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24e08d2b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java index bd71f1b..de17eb6 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java @@ -90,8 +90,15 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat } @Test - public void shouldReturnResponseAttributes() throws Exception { - final ResultSet results = client.submit("g.V()"); + public void shouldReturnResponseAttributesViaNoContent() throws Exception { + final ResultSet results = client.submit("[]"); + final Map<String,Object> attr = results.statusAttributes().get(20000, TimeUnit.MILLISECONDS); + assertThat(attr.containsKey(Tokens.ARGS_HOST), is(true)); + } + + @Test + public void shouldReturnResponseAttributesViaSuccess() throws Exception { + final ResultSet results = client.submit("gmodern.V()"); final Map<String,Object> attr = results.statusAttributes().get(20000, TimeUnit.MILLISECONDS); assertThat(attr.containsKey(Tokens.ARGS_HOST), is(true)); }
