This is a clone of {@link ClientStream#cancel(Status)}; - * {@link AbstractClientStream2#cancel} delegates to this method. + * {@link AbstractClientStream#cancel} delegates to this method. */ void cancel(Status status); } @@ -104,7 +104,7 @@ public abstract class AbstractClientStream2 extends AbstractStream2 */ private volatile boolean cancelled; - protected AbstractClientStream2(WritableBufferAllocator bufferAllocator, + protected AbstractClientStream(WritableBufferAllocator bufferAllocator, StatsTraceContext statsTraceCtx, Metadata headers, boolean useGet) { Preconditions.checkNotNull(headers, "headers"); this.useGet = useGet; @@ -182,7 +182,7 @@ public abstract class AbstractClientStream2 extends AbstractStream2 } /** This should only called from the transport thread. */ - protected abstract static class TransportState extends AbstractStream2.TransportState { + protected abstract static class TransportState extends AbstractStream.TransportState { /** Whether listener.closed() has been called. */ private final StatsTraceContext statsTraceCtx; private boolean listenerClosed; diff --git a/core/src/main/java/io/grpc/internal/AbstractServerStream.java b/core/src/main/java/io/grpc/internal/AbstractServerStream.java index 9bcc6a04f4..cc9ecd57ec 100644 --- a/core/src/main/java/io/grpc/internal/AbstractServerStream.java +++ b/core/src/main/java/io/grpc/internal/AbstractServerStream.java @@ -42,7 +42,7 @@ import javax.annotation.Nullable; * implement {@link #transportState()} and {@link #abstractServerStreamSink()}. Must only be called * from the sending application thread. */ -public abstract class AbstractServerStream extends AbstractStream2 +public abstract class AbstractServerStream extends AbstractStream implements ServerStream, MessageFramer.Sink { /** * A sink for outbound operations, separated from the stream simply to avoid name @@ -184,7 +184,7 @@ public abstract class AbstractServerStream extends AbstractStream2 } /** This should only called from the transport thread. */ - protected abstract static class TransportState extends AbstractStream2.TransportState { + protected abstract static class TransportState extends AbstractStream.TransportState { /** Whether listener.closed() has been called. */ private boolean listenerClosed; private ServerStreamListener listener; diff --git a/core/src/main/java/io/grpc/internal/AbstractStream2.java b/core/src/main/java/io/grpc/internal/AbstractStream.java similarity index 97% rename from core/src/main/java/io/grpc/internal/AbstractStream2.java rename to core/src/main/java/io/grpc/internal/AbstractStream.java index df50d1d7cb..b2e2f8e31f 100644 --- a/core/src/main/java/io/grpc/internal/AbstractStream2.java +++ b/core/src/main/java/io/grpc/internal/AbstractStream.java @@ -45,7 +45,7 @@ import javax.annotation.concurrent.GuardedBy; * The stream and stream state as used by the application. Must only be called from the sending * application thread. */ -public abstract class AbstractStream2 implements Stream { +public abstract class AbstractStream implements Stream { /** The framer to use for sending messages. */ protected abstract Framer framer(); @@ -252,10 +252,10 @@ public abstract class AbstractStream2 implements Stream { /** * Notify that the stream does not exist in a usable state any longer. This causes {@link - * AbstractStream2#isReady()} to return {@code false} from this point forward. + * AbstractStream#isReady()} to return {@code false} from this point forward. * *
This does not generally need to be called explicitly by the transport, as it is handled - * implicitly by {@link AbstractClientStream2} and {@link AbstractServerStream}. + * implicitly by {@link AbstractClientStream} and {@link AbstractServerStream}. */ protected final void onStreamDeallocated() { synchronized (onReadyLock) { diff --git a/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java b/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java index 29c8012254..6dc8b95aaf 100644 --- a/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java +++ b/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java @@ -42,7 +42,7 @@ import javax.annotation.Nullable; /** * Base implementation for client streams using HTTP2 as the transport. */ -public abstract class Http2ClientStreamTransportState extends AbstractClientStream2.TransportState { +public abstract class Http2ClientStreamTransportState extends AbstractClientStream.TransportState { /** * Metadata marshaller for HTTP status lines. diff --git a/core/src/test/java/io/grpc/internal/AbstractClientStream2Test.java b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java similarity index 87% rename from core/src/test/java/io/grpc/internal/AbstractClientStream2Test.java rename to core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java index 8fee97827d..465c684344 100644 --- a/core/src/test/java/io/grpc/internal/AbstractClientStream2Test.java +++ b/core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java @@ -48,7 +48,7 @@ import io.grpc.Metadata; import io.grpc.Status; import io.grpc.Status.Code; import io.grpc.StreamTracer; -import io.grpc.internal.AbstractClientStream2.TransportState; +import io.grpc.internal.AbstractClientStream.TransportState; import io.grpc.internal.MessageFramerTest.ByteWritableBuffer; import java.io.ByteArrayInputStream; import org.junit.Before; @@ -63,11 +63,11 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; /** - * Test for {@link AbstractClientStream2}. This class tries to test functionality in + * Test for {@link AbstractClientStream}. This class tries to test functionality in * AbstractClientStream2, but not in any super classes. */ @RunWith(JUnit4.class) -public class AbstractClientStream2Test { +public class AbstractClientStreamTest { @Rule public final ExpectedException thrown = ExpectedException.none(); @@ -91,7 +91,7 @@ public class AbstractClientStream2Test { public void cancel_doNotAcceptOk() { for (Code code : Code.values()) { ClientStreamListener listener = new NoopClientStreamListener(); - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(listener); if (code != Code.OK) { stream.cancel(Status.fromCodeValue(code.value())); @@ -109,7 +109,7 @@ public class AbstractClientStream2Test { @Test public void cancel_failsOnNull() { ClientStreamListener listener = new NoopClientStreamListener(); - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(listener); thrown.expect(NullPointerException.class); @@ -119,7 +119,7 @@ public class AbstractClientStream2Test { @Test public void cancel_notifiesOnlyOnce() { final BaseTransportState state = new BaseTransportState(statsTraceCtx); - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, state, new BaseSink() { + AbstractClientStream stream = new BaseAbstractClientStream(allocator, state, new BaseSink() { @Override public void cancel(Status errorStatus) { // Cancel should eventually result in a transportReportStatus on the transport thread @@ -136,7 +136,7 @@ public class AbstractClientStream2Test { @Test public void startFailsOnNullListener() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); thrown.expect(NullPointerException.class); @@ -145,7 +145,7 @@ public class AbstractClientStream2Test { @Test public void cantCallStartTwice() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); thrown.expect(IllegalStateException.class); @@ -155,7 +155,7 @@ public class AbstractClientStream2Test { @Test public void inboundDataReceived_failsOnNullFrame() { ClientStreamListener listener = new NoopClientStreamListener(); - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(listener); TransportState state = stream.transportState(); @@ -166,7 +166,7 @@ public class AbstractClientStream2Test { @Test public void inboundHeadersReceived_notifiesListener() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); Metadata headers = new Metadata(); @@ -176,7 +176,7 @@ public class AbstractClientStream2Test { @Test public void inboundHeadersReceived_failsIfStatusReported() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); stream.transportState().transportReportStatus(Status.CANCELLED, false, new Metadata()); @@ -188,7 +188,7 @@ public class AbstractClientStream2Test { @Test public void inboundHeadersReceived_acceptsGzipEncoding() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); Metadata headers = new Metadata(); headers.put(GrpcUtil.MESSAGE_ENCODING_KEY, new Codec.Gzip().getMessageEncoding()); @@ -199,7 +199,7 @@ public class AbstractClientStream2Test { @Test public void inboundHeadersReceived_acceptsIdentityEncoding() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); Metadata headers = new Metadata(); headers.put(GrpcUtil.MESSAGE_ENCODING_KEY, Codec.Identity.NONE.getMessageEncoding()); @@ -210,7 +210,7 @@ public class AbstractClientStream2Test { @Test public void rstStreamClosesStream() { - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, statsTraceCtx); + AbstractClientStream stream = new BaseAbstractClientStream(allocator, statsTraceCtx); stream.start(mockListener); // The application will call request when waiting for a message, which will in turn call this // on the transport thread. @@ -226,7 +226,7 @@ public class AbstractClientStream2Test { @Test public void getRequest() { - AbstractClientStream2.Sink sink = mock(AbstractClientStream2.Sink.class); + AbstractClientStream.Sink sink = mock(AbstractClientStream.Sink.class); final ClientStreamTracer tracer = spy(new ClientStreamTracer() {}); ClientStreamTracer.Factory tracerFactory = new ClientStreamTracer.Factory() { @@ -236,7 +236,7 @@ public class AbstractClientStream2Test { } }; StatsTraceContext statsTraceCtx = new StatsTraceContext(new StreamTracer[] {tracer}); - AbstractClientStream2 stream = new BaseAbstractClientStream(allocator, + AbstractClientStream stream = new BaseAbstractClientStream(allocator, new BaseTransportState(statsTraceCtx), sink, statsTraceCtx, true); stream.start(mockListener); stream.writeMessage(new ByteArrayInputStream(new byte[1])); @@ -259,7 +259,7 @@ public class AbstractClientStream2Test { /** * No-op base class for testing. */ - private static class BaseAbstractClientStream extends AbstractClientStream2 { + private static class BaseAbstractClientStream extends AbstractClientStream { private final TransportState state; private final Sink sink; @@ -305,7 +305,7 @@ public class AbstractClientStream2Test { } } - private static class BaseSink implements AbstractClientStream2.Sink { + private static class BaseSink implements AbstractClientStream.Sink { @Override public void writeHeaders(Metadata headers, byte[] payload) {} @@ -319,7 +319,7 @@ public class AbstractClientStream2Test { public void cancel(Status reason) {} } - private static class BaseTransportState extends AbstractClientStream2.TransportState { + private static class BaseTransportState extends AbstractClientStream.TransportState { public BaseTransportState(StatsTraceContext statsTraceCtx) { super(DEFAULT_MAX_MESSAGE_SIZE, statsTraceCtx); } diff --git a/netty/src/main/java/io/grpc/netty/NettyClientStream.java b/netty/src/main/java/io/grpc/netty/NettyClientStream.java index 2cb1b0f28d..b2c1479d79 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientStream.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientStream.java @@ -43,7 +43,7 @@ import io.grpc.InternalMethodDescriptor; import io.grpc.Metadata; import io.grpc.MethodDescriptor; import io.grpc.Status; -import io.grpc.internal.AbstractClientStream2; +import io.grpc.internal.AbstractClientStream; import io.grpc.internal.GrpcUtil; import io.grpc.internal.Http2ClientStreamTransportState; import io.grpc.internal.StatsTraceContext; @@ -61,7 +61,7 @@ import javax.annotation.Nullable; * Client stream for a Netty transport. Must only be called from the sending application * thread. */ -class NettyClientStream extends AbstractClientStream2 { +class NettyClientStream extends AbstractClientStream { private static final InternalMethodDescriptor methodDescriptorAccessor = new InternalMethodDescriptor(InternalKnownTransport.NETTY); @@ -115,7 +115,7 @@ class NettyClientStream extends AbstractClientStream2 { return method.isSafe(); } - private class Sink implements AbstractClientStream2.Sink { + private class Sink implements AbstractClientStream.Sink { @Override public void writeHeaders(Metadata headers, byte[] requestPayload) { // Convert the headers into Netty HTTP/2 headers. diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java index d1ff6ab5d9..9b5ad399f1 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java @@ -39,7 +39,7 @@ import io.grpc.Attributes; import io.grpc.Metadata; import io.grpc.MethodDescriptor; import io.grpc.Status; -import io.grpc.internal.AbstractClientStream2; +import io.grpc.internal.AbstractClientStream; import io.grpc.internal.GrpcUtil; import io.grpc.internal.Http2ClientStreamTransportState; import io.grpc.internal.StatsTraceContext; @@ -55,7 +55,7 @@ import okio.Buffer; /** * Client stream for the okhttp transport. */ -class OkHttpClientStream extends AbstractClientStream2 { +class OkHttpClientStream extends AbstractClientStream { private static final int WINDOW_UPDATE_THRESHOLD = Utils.DEFAULT_WINDOW_SIZE / 2; @@ -124,7 +124,7 @@ class OkHttpClientStream extends AbstractClientStream2 { return Attributes.EMPTY; } - class Sink implements AbstractClientStream2.Sink { + class Sink implements AbstractClientStream.Sink { @Override public void writeHeaders(Metadata metadata, byte[] payload) { String defaultPath = "/" + method.getFullMethodName(); diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java index 642dee7807..52029cd9ad 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java @@ -69,7 +69,7 @@ import io.grpc.MethodDescriptor.MethodType; import io.grpc.Status; import io.grpc.Status.Code; import io.grpc.StatusException; -import io.grpc.internal.AbstractStream2; +import io.grpc.internal.AbstractStream; import io.grpc.internal.ClientStreamListener; import io.grpc.internal.ClientTransport; import io.grpc.internal.GrpcUtil; @@ -1129,7 +1129,7 @@ public class OkHttpClientTransportTest { initTransport(); // exactly one byte below the threshold int messageLength = - AbstractStream2.TransportState.DEFAULT_ONREADY_THRESHOLD - HEADER_LENGTH - 1; + AbstractStream.TransportState.DEFAULT_ONREADY_THRESHOLD - HEADER_LENGTH - 1; setInitialWindowSize(0); MockStreamListener listener = new MockStreamListener(); OkHttpClientStream stream = clientTransport.newStream(method, new Metadata());