Fixed merge issues from previous commit.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a138d554 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a138d554 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a138d554 Branch: refs/heads/TINKERPOP-1254 Commit: a138d5549348f2202669af86841be49f99c838ad Parents: e5cbe53 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jul 6 11:46:04 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jul 6 11:46:04 2016 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 ++---- .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a138d554/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java index 813174c..114fa28 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java @@ -30,10 +30,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.Operator; import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.Scope; -import org.apache.tinkerpop.gremlin.server.GraphManager; -import org.apache.tinkerpop.gremlin.server.handler.Frame; +import org.apache.tinkerpop.gremlin.server.OpProcessor; import org.apache.tinkerpop.gremlin.server.handler.GremlinResponseFrameEncoder; -import org.apache.tinkerpop.gremlin.server.handler.StateKey; import org.apache.tinkerpop.gremlin.structure.Column; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.server.Context; @@ -49,6 +47,7 @@ import org.slf4j.LoggerFactory; import javax.script.Bindings; import javax.script.SimpleBindings; import java.util.Arrays; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -58,7 +57,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; import java.util.regex.Pattern; -import java.util.stream.Stream; import static com.codahale.metrics.MetricRegistry.name; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a138d554/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index 37c310f..50ed066 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java @@ -78,6 +78,7 @@ import static org.hamcrest.core.IsNot.not; import static org.hamcrest.core.StringEndsWith.endsWith; import static org.hamcrest.core.StringStartsWith.startsWith; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeThat; import static org.junit.Assert.assertEquals;
