Remove traces of gRPC v1 protocol vs gRPC v2 protocol.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=84087425

Author: simonma

core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java

@@ -208,7 +208,7 @@ public void transportReportStatus(final Status newStatus, boolean stopDelivery,
     closeListenerTask = null;
 
     // Determine if the deframer is stalled (i.e. currently has no complete messages to deliver).
-    boolean deliveryStalled = !deframer2.isDeliveryOutstanding();
+    boolean deliveryStalled = !deframer.isDeliveryOutstanding();
 
     if (stopDelivery || deliveryStalled) {
       // Close the listener immediately.

core/src/main/java/com/google/net/stubby/transport/AbstractStream.java

@@ -58,7 +58,7 @@ protected enum Phase {
   }
 
   private volatile IdT id;
-  private final MessageFramer2 framer;
+  private final MessageFramer framer;
   private final FutureCallback<Object> deframerErrorCallback = new FutureCallback<Object>() {
     @Override
     public void onSuccess(Object result) {}
@@ -69,7 +69,7 @@ public void onFailure(Throwable t) {
     }
   };
 
-  final MessageDeframer2 deframer2;
+  final MessageDeframer deframer;
 
   /**
    * Inbound phase is exclusively written to by the transport thread.
@@ -82,7 +82,7 @@ public void onFailure(Throwable t) {
   private Phase outboundPhase = Phase.HEADERS;
 
   AbstractStream(Executor deframerExecutor) {
-    MessageDeframer2.Listener inboundMessageHandler = new MessageDeframer2.Listener() {
+    MessageDeframer.Listener inboundMessageHandler = new MessageDeframer.Listener() {
       @Override
       public void bytesRead(int numBytes) {
         returnProcessedBytes(numBytes);
@@ -109,15 +109,15 @@ public void endOfStream() {
         remoteEndClosed();
       }
     };
-    MessageFramer2.Sink<ByteBuffer> outboundFrameHandler = new MessageFramer2.Sink<ByteBuffer>() {
+    MessageFramer.Sink<ByteBuffer> outboundFrameHandler = new MessageFramer.Sink<ByteBuffer>() {
       @Override
       public void deliverFrame(ByteBuffer frame, boolean endOfStream) {
         internalSendFrame(frame, endOfStream);
       }
     };
 
-    framer = new MessageFramer2(outboundFrameHandler, 4096);
-    this.deframer2 = new MessageDeframer2(inboundMessageHandler, deframerExecutor);
+    framer = new MessageFramer(outboundFrameHandler, 4096);
+    this.deframer = new MessageDeframer(inboundMessageHandler, deframerExecutor);
   }
 
   /**
@@ -219,7 +219,7 @@ public void dispose() {
    */
   protected final void deframe(Buffer frame, boolean endOfStream) {
     ListenableFuture<?> future;
-    future = deframer2.deframe(frame, endOfStream);
+    future = deframer.deframe(frame, endOfStream);
     if (future != null) {
       Futures.addCallback(future, deframerErrorCallback);
     }
@@ -229,7 +229,7 @@ protected final void deframe(Buffer frame, boolean endOfStream) {
    * Delays delivery from the deframer until the given future completes.
    */
   protected final void delayDeframer(ListenableFuture<?> future) {
-    ListenableFuture<?> deliveryFuture = deframer2.delayProcessing(future);
+    ListenableFuture<?> deliveryFuture = deframer.delayProcessing(future);
     if (deliveryFuture != null) {
       Futures.addCallback(deliveryFuture, deframerErrorCallback);
     }

core/src/main/java/com/google/net/stubby/transport/Http2ClientStream.java

@@ -123,20 +123,10 @@ protected void transportDataReceived(Buffer frame, boolean endOfStream) {
     } else {
       inboundDataReceived(frame);
       if (endOfStream) {
-        if (false) {
-          // This is a protocol violation as we expect to receive trailers.
-          transportError = Status.INTERNAL.withDescription("Recevied EOS on DATA frame");
-          frame.close();
-          inboundTransportError(transportError);
-        } else {
-          // TODO(user): Delete this hack when trailers are supported by GFE with v2. Currently
-          // GFE doesn't support trailers, so when using gRPC v2 protocol GFE will not send any
-          // status. We paper over this for now by just assuming OK. For all properly functioning
-          // servers (both v1 and v2), stashedStatus should not be null here.
-          Metadata.Trailers trailers = new Metadata.Trailers();
-          trailers.put(Status.CODE_KEY, Status.OK);
-          inboundTrailersReceived(trailers, Status.OK);
-        }
+        // This is a protocol violation as we expect to receive trailers.
+        transportError = Status.INTERNAL.withDescription("Recevied EOS on DATA frame");
+        frame.close();
+        inboundTransportError(transportError);
       }
     }
   }

core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java renamed to core/src/main/java/com/google/net/stubby/transport/MessageDeframer.java

@@ -56,7 +56,7 @@
  * executor provided during creation. That executor must not allow concurrent execution of tasks.
  */
 @NotThreadSafe
-public class MessageDeframer2 implements Closeable {
+public class MessageDeframer implements Closeable {
   private static final int HEADER_LENGTH = 5;
   private static final int COMPRESSED_FLAG_MASK = 1;
   private static final int RESERVED_MASK = 0xFE;
@@ -123,7 +123,7 @@ private enum State {
    * @param listener listener for deframer events.
    * @param executor used for internal event processing
    */
-  public MessageDeframer2(Listener listener, Executor executor) {
+  public MessageDeframer(Listener listener, Executor executor) {
     this(listener, executor, Compression.NONE);
   }
 
@@ -136,7 +136,7 @@ public MessageDeframer2(Listener listener, Executor executor) {
    * @param compression the compression used if a compressed frame is encountered, with NONE meaning
    *        unsupported
    */
-  public MessageDeframer2(Listener listener, Executor executor, Compression compression) {
+  public MessageDeframer(Listener listener, Executor executor, Compression compression) {
     this.listener = Preconditions.checkNotNull(listener, "sink");
     this.executor = Preconditions.checkNotNull(executor, "executor");
     this.compression = Preconditions.checkNotNull(compression, "compression");

core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java renamed to core/src/main/java/com/google/net/stubby/transport/MessageFramer.java

@@ -45,9 +45,9 @@
 
 /**
  * Encodes gRPC messages to be delivered via the transport layer which implements {@link
- * MessageFramer2.Sink}.
+ * MessageFramer.Sink}.
  */
-public class MessageFramer2 {
+public class MessageFramer {
   /**
    * Sink implemented by the transport layer to receive frames and forward them to their destination
    */
@@ -75,11 +75,11 @@ public enum Compression {
   private final OutputStreamAdapter outputStreamAdapter = new OutputStreamAdapter();
   private final byte[] headerScratch = new byte[HEADER_LENGTH];
 
-  public MessageFramer2(Sink<ByteBuffer> sink, int maxFrameSize) {
+  public MessageFramer(Sink<ByteBuffer> sink, int maxFrameSize) {
     this(sink, maxFrameSize, Compression.NONE);
   }
 
-  public MessageFramer2(Sink<ByteBuffer> sink, int maxFrameSize, Compression compression) {
+  public MessageFramer(Sink<ByteBuffer> sink, int maxFrameSize, Compression compression) {
     this.sink = Preconditions.checkNotNull(sink, "sink");
     this.bytebuf = ByteBuffer.allocate(maxFrameSize);
     this.compression = Preconditions.checkNotNull(compression, "compression");

core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java renamed to core/src/test/java/com/google/net/stubby/transport/MessageDeframerTest.java

@@ -51,7 +51,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.transport.MessageDeframer2.Listener;
+import com.google.net.stubby.transport.MessageDeframer.Listener;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,13 +66,13 @@
 import java.util.zip.GZIPOutputStream;
 
 /**
- * Tests for {@link MessageDeframer2}.
+ * Tests for {@link MessageDeframer}.
  */
 @RunWith(JUnit4.class)
-public class MessageDeframer2Test {
+public class MessageDeframerTest {
   private Listener listener = mock(Listener.class);
-  private MessageDeframer2 deframer =
-      new MessageDeframer2(listener, MoreExecutors.directExecutor());
+  private MessageDeframer deframer =
+      new MessageDeframer(listener, MoreExecutors.directExecutor());
   private ArgumentCaptor<InputStream> messages = ArgumentCaptor.forClass(InputStream.class);
 
   @Test
@@ -259,8 +259,8 @@ public void futureFailureShouldStopAndPropagateFailure() throws InterruptedExcep
 
   @Test
   public void compressed() {
-    deframer = new MessageDeframer2(
-        listener, MoreExecutors.directExecutor(), MessageDeframer2.Compression.GZIP);
+    deframer = new MessageDeframer(
+        listener, MoreExecutors.directExecutor(), MessageDeframer.Compression.GZIP);
     byte[] payload = compress(new byte[1000]);
     assertTrue(payload.length < 100);
     byte[] header = new byte[] {1, 0, 0, 0, (byte) payload.length};

core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java renamed to core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java

@@ -53,16 +53,16 @@
 import java.util.List;
 
 /**
- * Tests for {@link MessageFramer2}
+ * Tests for {@link MessageFramer}
  */
 @RunWith(JUnit4.class)
-public class MessageFramer2Test {
+public class MessageFramerTest {
   private static final int TRANSPORT_FRAME_SIZE = 12;
 
   @Mock
-  private MessageFramer2.Sink<List<Byte>> sink;
-  private MessageFramer2.Sink<ByteBuffer> copyingSink;
-  private MessageFramer2 framer;
+  private MessageFramer.Sink<List<Byte>> sink;
+  private MessageFramer.Sink<ByteBuffer> copyingSink;
+  private MessageFramer framer;
 
   @Captor
   private ArgumentCaptor<List<Byte>> frameCaptor;
@@ -72,7 +72,7 @@ public void setup() {
     MockitoAnnotations.initMocks(this);
 
     copyingSink = new ByteArrayConverterSink(sink);
-    framer = new MessageFramer2(copyingSink, TRANSPORT_FRAME_SIZE);
+    framer = new MessageFramer(copyingSink, TRANSPORT_FRAME_SIZE);
   }
 
   @Test
@@ -156,7 +156,7 @@ public void flushIsIdempotent() {
   @Test
   public void largerFrameSize() throws Exception {
     final int transportFrameSize = 10000;
-    MessageFramer2 framer = new MessageFramer2(copyingSink, transportFrameSize);
+    MessageFramer framer = new MessageFramer(copyingSink, transportFrameSize);
     writePayload(framer, new byte[1000]);
     framer.flush();
     verify(sink).deliverFrame(frameCaptor.capture(), eq(false));
@@ -169,8 +169,8 @@ public void largerFrameSize() throws Exception {
   @Test
   public void compressed() throws Exception {
     final int transportFrameSize = 100;
-    MessageFramer2 framer = new MessageFramer2(copyingSink, transportFrameSize,
-        MessageFramer2.Compression.GZIP);
+    MessageFramer framer = new MessageFramer(copyingSink, transportFrameSize,
+        MessageFramer.Compression.GZIP);
     writePayload(framer, new byte[1000]);
     framer.flush();
     verify(sink).deliverFrame(frameCaptor.capture(), eq(false));
@@ -183,18 +183,18 @@ public void compressed() throws Exception {
     verifyNoMoreInteractions(sink);
   }
 
-  private static void writePayload(MessageFramer2 framer, byte[] bytes) {
+  private static void writePayload(MessageFramer framer, byte[] bytes) {
     framer.writePayload(new ByteArrayInputStream(bytes), bytes.length);
   }
 
   /**
    * Since ByteBuffers are reused, this sink copies their value at the time of the call. Converting
    * to List<Byte> is convenience.
    */
-  private static class ByteArrayConverterSink implements MessageFramer2.Sink<ByteBuffer> {
-    private final MessageFramer2.Sink<List<Byte>> delegate;
+  private static class ByteArrayConverterSink implements MessageFramer.Sink<ByteBuffer> {
+    private final MessageFramer.Sink<List<Byte>> delegate;
 
-    public ByteArrayConverterSink(MessageFramer2.Sink<List<Byte>> delegate) {
+    public ByteArrayConverterSink(MessageFramer.Sink<List<Byte>> delegate) {
       this.delegate = delegate;
     }
 

netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java

@@ -53,7 +53,7 @@
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
 import com.google.net.stubby.Status.Code;
-import com.google.net.stubby.transport.MessageFramer2;
+import com.google.net.stubby.transport.MessageFramer;
 import com.google.net.stubby.transport.ServerStream;
 import com.google.net.stubby.transport.ServerStreamListener;
 import com.google.net.stubby.transport.ServerTransportListener;
@@ -271,7 +271,7 @@ private void createStream() throws Exception {
 
   private ByteBuf dataFrame(int streamId, boolean endStream) {
     final ByteBuf compressionFrame = Unpooled.buffer(CONTENT.length);
-    MessageFramer2 framer = new MessageFramer2(new MessageFramer2.Sink<ByteBuffer>() {
+    MessageFramer framer = new MessageFramer(new MessageFramer.Sink<ByteBuffer>() {
       @Override
       public void deliverFrame(ByteBuffer frame, boolean endOfStream) {
         compressionFrame.writeBytes(frame);