without allocateKnownLength()

Author: panchenko

core/src/main/java/io/grpc/internal/MessageFramer.java

@@ -239,7 +239,7 @@ private int writeKnownLengthUncompressed(InputStream message, int messageLength)
    * that.
    */
   private WritableBuffer allocateKnownLength() {
-    WritableBuffer newBuffer = bufferAllocator.allocateKnownLength(knownLengthPendingAllocation);
+    WritableBuffer newBuffer = bufferAllocator.allocate(knownLengthPendingAllocation);
     knownLengthPendingAllocation -= Math.min(knownLengthPendingAllocation,
         newBuffer.writableBytes());
     return newBuffer;
@@ -259,7 +259,7 @@ private void writeBufferChain(BufferChainOutputStream bufferChain, boolean compr
     }
     headerScratch.clear();
     headerScratch.put(compressed ? COMPRESSED : UNCOMPRESSED).putInt(messageLength);
-    WritableBuffer writeableHeader = bufferAllocator.allocateKnownLength(HEADER_LENGTH);
+    WritableBuffer writeableHeader = bufferAllocator.allocate(HEADER_LENGTH);
     writeableHeader.write(headerScratch.array(), 0, headerScratch.position());
     if (messageLength == 0) {
       // the payload had 0 length so make the header the current buffer.

core/src/main/java/io/grpc/internal/WritableBufferAllocator.java

@@ -27,12 +27,4 @@ public interface WritableBufferAllocator {
    * free to return a buffer with a greater or lesser capacity.
    */
   WritableBuffer allocate(int capacityHint);
-
-  /**
-   * Request a new {@link WritableBuffer} with the given {@code capacityHint}. This method is
-   * similar to {@link #allocate(int)}, but there is no need to allocate greater capacity.
-   */
-  default WritableBuffer allocateKnownLength(int capacityHint) {
-    return allocate(capacityHint);
-  }
 }

netty/src/main/java/io/grpc/netty/NettyWritableBufferAllocator.java

@@ -33,9 +33,6 @@
  */
 class NettyWritableBufferAllocator implements WritableBufferAllocator {
 
-  // Use 4k as our minimum buffer size.
-  private static final int MIN_BUFFER = 4 * 1024;
-
   // Set the maximum buffer size to 1MB.
   private static final int MAX_BUFFER = 1024 * 1024;
 
@@ -47,11 +44,6 @@ class NettyWritableBufferAllocator implements WritableBufferAllocator {
 
   @Override
   public WritableBuffer allocate(int capacityHint) {
-    return allocateKnownLength(Math.max(MIN_BUFFER, capacityHint));
-  }
-
-  @Override
-  public WritableBuffer allocateKnownLength(int capacityHint) {
     capacityHint = Math.min(MAX_BUFFER, capacityHint);
     return new NettyWritableBuffer(allocator.buffer(capacityHint, capacityHint));
   }

okhttp/src/main/java/io/grpc/okhttp/OkHttpWritableBufferAllocator.java

@@ -44,12 +44,7 @@ class OkHttpWritableBufferAllocator implements WritableBufferAllocator {
   @Override
   public WritableBuffer allocate(int capacityHint) {
     // okio buffer uses fixed size Segments, round capacityHint up
-    return allocateKnownLength((capacityHint + Segment.SIZE - 1) / Segment.SIZE * Segment.SIZE);
-  }
-
-  @Override
-  public WritableBuffer allocateKnownLength(int capacityHint) {
-    capacityHint = Math.min(MAX_BUFFER, capacityHint);
-    return new OkHttpWritableBuffer(new Buffer(), capacityHint);
+    return new OkHttpWritableBuffer(new Buffer(),
+        Math.min(MAX_BUFFER, (capacityHint + Segment.SIZE - 1) / Segment.SIZE * Segment.SIZE));
   }
 }

servlet/src/main/java/io/grpc/servlet/ServletServerStream.java

@@ -38,7 +38,6 @@
 import io.grpc.internal.TransportFrameUtil;
 import io.grpc.internal.TransportTracer;
 import io.grpc.internal.WritableBuffer;
-import io.grpc.internal.WritableBufferAllocator;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -73,7 +72,7 @@ final class ServletServerStream extends AbstractServerStream {
       Attributes attributes,
       String authority,
       InternalLogId logId) throws IOException {
-    super(ALLOCATOR, statsTraceCtx);
+    super(ByteArrayWritableBuffer::new, statsTraceCtx);
     transportState =
         new ServletTransportState(maxInboundMessageSize, statsTraceCtx, new TransportTracer());
     this.attributes = attributes;
@@ -162,20 +161,6 @@ public void deframeFailed(Throwable cause) {
     }
   }
 
-  private static final WritableBufferAllocator ALLOCATOR = new WritableBufferAllocator() {
-    private static final int MIN_BUFFER = 4096;
-
-    @Override
-    public WritableBuffer allocate(int capacityHint) {
-      return new ByteArrayWritableBuffer(max(MIN_BUFFER, capacityHint));
-    }
-
-    @Override
-    public WritableBuffer allocateKnownLength(int capacityHint) {
-      return new ByteArrayWritableBuffer(capacityHint);
-    }
-  };
-
   private static final class ByteArrayWritableBuffer implements WritableBuffer {
 
     private final int capacity;