From 26d77ecd2e06baf321f3381730db81403d7b205a Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 23 Jul 2015 10:09:30 -0700 Subject: [PATCH] Minor readability changes Improved some consistency. writeHeaders was the only non-final implementation method of ServerStream, even though it is really no different than the others. --- .../src/main/java/io/grpc/transport/AbstractServerStream.java | 4 +++- .../main/java/io/grpc/transport/netty/NettyServerStream.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/io/grpc/transport/AbstractServerStream.java b/core/src/main/java/io/grpc/transport/AbstractServerStream.java index b6252a7e99..fc125fd2b9 100644 --- a/core/src/main/java/io/grpc/transport/AbstractServerStream.java +++ b/core/src/main/java/io/grpc/transport/AbstractServerStream.java @@ -44,6 +44,8 @@ import java.util.logging.Logger; /** * Abstract base class for {@link ServerStream} implementations. + * + * @param the type of the stream identifier */ public abstract class AbstractServerStream extends AbstractStream implements ServerStream { @@ -89,7 +91,7 @@ public abstract class AbstractServerStream extends AbstractStream } @Override - public void writeHeaders(Metadata.Headers headers) { + public final void writeHeaders(Metadata.Headers headers) { Preconditions.checkNotNull(headers, "headers"); outboundPhase(Phase.HEADERS); headersSent = true; diff --git a/netty/src/main/java/io/grpc/transport/netty/NettyServerStream.java b/netty/src/main/java/io/grpc/transport/netty/NettyServerStream.java index e46c1985ce..43585807ef 100644 --- a/netty/src/main/java/io/grpc/transport/netty/NettyServerStream.java +++ b/netty/src/main/java/io/grpc/transport/netty/NettyServerStream.java @@ -52,11 +52,11 @@ class NettyServerStream extends AbstractServerStream { private final Channel channel; private final NettyServerHandler handler; private final Http2Stream http2Stream; - private WriteQueue writeQueue; + private final WriteQueue writeQueue; NettyServerStream(Channel channel, Http2Stream http2Stream, NettyServerHandler handler) { super(new NettyWritableBufferAllocator(channel.alloc())); - writeQueue = handler.getWriteQueue(); + this.writeQueue = handler.getWriteQueue(); this.channel = checkNotNull(channel, "channel"); this.http2Stream = checkNotNull(http2Stream, "http2Stream"); this.handler = checkNotNull(handler, "handler");