TINKERPOP-2005 Minor code cleanup * Declare variables 'final' * Remove unused variables
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0e0d26cd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0e0d26cd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0e0d26cd Branch: refs/heads/tp32 Commit: 0e0d26cdafca3c2a3244fe224f3f08391669d470 Parents: 63ae13c Author: Dmitri Bourlatchkov <dmitri.bourlatch...@datastax.com> Authored: Tue Jul 31 10:48:12 2018 -0400 Committer: Dmitri Bourlatchkov <dmitri.bourlatch...@datastax.com> Committed: Tue Jul 31 10:48:12 2018 -0400 ---------------------------------------------------------------------- .../gremlin/server/ResponseHandlerContext.java | 6 +++--- .../gremlin/server/op/AbstractEvalOpProcessor.java | 3 +-- .../gremlin/server/op/AbstractOpProcessor.java | 4 ++-- .../gremlin/server/GremlinServerIntegrateTest.java | 4 ++-- .../gremlin/server/ResponseHandlerContextTest.java | 4 ++-- .../server/op/AbstractEvalOpProcessorTest.java | 14 +++++++------- .../gremlin/server/op/AbstractOpProcessorTest.java | 12 ++++++------ 7 files changed, 23 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java index 3c8c13c..5cc79b5 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java @@ -42,7 +42,7 @@ public class ResponseHandlerContext { private final Context context; private final AtomicBoolean finalResponseWritten = new AtomicBoolean(); - public ResponseHandlerContext(Context context) { + public ResponseHandlerContext(final Context context) { this.context = context; } @@ -58,7 +58,7 @@ public class ResponseHandlerContext { * <p>Attempts to write more than one final response message will be ignored.</p> * @see #writeAndFlush(ResponseStatusCode, Object) */ - public void writeAndFlush(ResponseMessage message) { + public void writeAndFlush(final ResponseMessage message) { writeAndFlush(message.getStatus().getCode(), message); } @@ -71,7 +71,7 @@ public class ResponseHandlerContext { * <p>Attempts to write more than one final response message will be ignored.</p> * @see #writeAndFlush(ResponseMessage) */ - public void writeAndFlush(ResponseStatusCode code, Object responseMessage) { + public void writeAndFlush(final ResponseStatusCode code, final Object responseMessage) { final boolean messageIsFinal = code.isFinalResponse(); if(finalResponseWritten.compareAndSet(false, messageIsFinal)) { context.getChannelHandlerContext().writeAndFlush(responseMessage); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/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 39168c2..ca1ee53 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 @@ -227,7 +227,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor { */ protected void evalOpInternal(final Context context, final Supplier<GremlinExecutor> gremlinExecutorSupplier, final BindingSupplier bindingsSupplier) throws OpProcessorException { - ResponseHandlerContext rhc = new ResponseHandlerContext(context); + final ResponseHandlerContext rhc = new ResponseHandlerContext(context); try { evalOpInternal(rhc, gremlinExecutorSupplier, bindingsSupplier); } catch (Exception ex) { @@ -251,7 +251,6 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor { final BindingSupplier bindingsSupplier) throws OpProcessorException { final Context context = rhc.getContext(); final Timer.Context timerContext = evalOpTimer.time(); - final ChannelHandlerContext ctx = context.getChannelHandlerContext(); final RequestMessage msg = context.getRequestMessage(); final GremlinExecutor gremlinExecutor = gremlinExecutorSupplier.get(); final Settings settings = context.getSettings(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/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 c2b6f1f..38ca3e1 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 @@ -278,8 +278,8 @@ public abstract class AbstractOpProcessor implements OpProcessor { protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg, final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate, final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception { - Context context = new Context(msg, ctx, null, null, null, null); // dummy context, good only for writing response messages to the channel - ResponseHandlerContext rhc = new ResponseHandlerContext(context); + final Context context = new Context(msg, ctx, null, null, null, null); // dummy context, good only for writing response messages to the channel + final ResponseHandlerContext rhc = new ResponseHandlerContext(context); return makeFrame(rhc, msg, serializer, useBinary, aggregate, code, responseMetaData); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/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 0867fd3..eb5def9 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 @@ -1028,8 +1028,8 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration final List<ResponseMessage> responses = client.submit(request); assertThat(responses.size(), Matchers.greaterThan(1)); for (Iterator<ResponseMessage> it = responses.iterator(); it.hasNext(); ) { - ResponseMessage msg = it.next(); - ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS; + final ResponseMessage msg = it.next(); + final ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS; assertEquals(expected, msg.getStatus().getCode()); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java index 6f15a33..13c9992 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java @@ -55,7 +55,7 @@ public class ResponseHandlerContextTest { { new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() { @Override - public Void apply(ResponseHandlerContext context, ResponseStatusCode code) { + public Void apply(final ResponseHandlerContext context, final ResponseStatusCode code) { context.writeAndFlush(code, "testMessage"); return null; } @@ -68,7 +68,7 @@ public class ResponseHandlerContextTest { }, { new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() { @Override - public Void apply(ResponseHandlerContext context, ResponseStatusCode code) { + public Void apply(final ResponseHandlerContext context, final ResponseStatusCode code) { context.writeAndFlush(ResponseMessage.build(UUID.randomUUID()).code(code).create()); return null; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java index 6f25e2e..72b9c5c 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java @@ -41,17 +41,17 @@ public class AbstractEvalOpProcessorTest { @Test public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException { - AbstractEvalOpProcessor processor = new StandardOpProcessor(); - RequestMessage request = RequestMessage.build("test").create(); - Settings settings = new Settings(); - ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); - ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); + final AbstractEvalOpProcessor processor = new StandardOpProcessor(); + final RequestMessage request = RequestMessage.build("test").create(); + final Settings settings = new Settings(); + final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); + final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); - GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class); + final GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class); Mockito.when(gremlinExecutor.eval(anyString(), anyString(), Mockito.any(), Mockito.<GremlinExecutor.LifeCycle>any())) .thenThrow(new IllegalStateException("test-exception")); - Context context = new Context(request, ctx, settings, null, gremlinExecutor, null); + final Context context = new Context(request, ctx, settings, null, gremlinExecutor, null); processor.evalOpInternal(context, context::getGremlinExecutor, SimpleBindings::new); Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture()); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java index cf42737..a7cee1a 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java @@ -33,9 +33,9 @@ public class AbstractOpProcessorTest { @Test public void deprecatedMakeFrameMethodShouldRedirectCorrectly() throws Exception { - ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); - RequestMessage request = RequestMessage.build("test").create(); - ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); + final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); + final RequestMessage request = RequestMessage.build("test").create(); + final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); try { // Induce a NullPointerException to validate error response message writing @@ -53,9 +53,9 @@ public class AbstractOpProcessorTest { @Test public void alternativeMakeFrameMethodShouldRedirectCorrectly() throws Exception { - ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); - RequestMessage request = RequestMessage.build("test").create(); - ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); + final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); + final RequestMessage request = RequestMessage.build("test").create(); + final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class); try { // Induce a NullPointerException to validate error response message writing
