Merge branch 'master' of github.com:grpc/grpc-java into impl/zero_copy_into_protobuf_2

Author: voidzcy

README.md

@@ -30,8 +30,8 @@ For a guided tour, take a look at the [quick start
 guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
 basics](https://grpc.io/docs/languages/java/basics).
 
-The [examples](https://github.com/grpc/grpc-java/tree/v1.31.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.31.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.31.1/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.31.1/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -42,17 +42,17 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-netty-shaded</artifactId>
-  <version>1.31.0</version>
+  <version>1.31.1</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.31.0</version>
+  <version>1.31.1</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.31.0</version>
+  <version>1.31.1</version>
 </dependency>
 <dependency> <!-- necessary for Java 9+ -->
   <groupId>org.apache.tomcat</groupId>
@@ -64,23 +64,23 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-implementation 'io.grpc:grpc-netty-shaded:1.31.0'
-implementation 'io.grpc:grpc-protobuf:1.31.0'
-implementation 'io.grpc:grpc-stub:1.31.0'
+implementation 'io.grpc:grpc-netty-shaded:1.31.1'
+implementation 'io.grpc:grpc-protobuf:1.31.1'
+implementation 'io.grpc:grpc-stub:1.31.1'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
 For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
 `grpc-protobuf-lite` instead of `grpc-protobuf`:
 ```gradle
-implementation 'io.grpc:grpc-okhttp:1.31.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.31.0'
-implementation 'io.grpc:grpc-stub:1.31.0'
+implementation 'io.grpc:grpc-okhttp:1.31.1'
+implementation 'io.grpc:grpc-protobuf-lite:1.31.1'
+implementation 'io.grpc:grpc-stub:1.31.1'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
 [the JARs]:
-https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.31.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.31.1
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://oss.sonatype.org/content/repositories/snapshots/).
@@ -112,7 +112,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <configuration>
         <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.31.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.31.1:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -142,7 +142,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.31.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.31.1'
     }
   }
   generateProtoTasks {

RELEASING.md

@@ -225,7 +225,7 @@ Now we need to update gh-pages with the new Javadoc:
 
 ```bash
 git checkout gh-pages
-git pull --ff-only
+git pull --ff-only upstream gh-pages
 rm -r javadoc/
 wget -O grpc-all-javadoc.jar "http://search.maven.org/remotecontent?filepath=io/grpc/grpc-all/$MAJOR.$MINOR.$PATCH/grpc-all-$MAJOR.$MINOR.$PATCH-javadoc.jar"
 unzip -d javadoc grpc-all-javadoc.jar

SECURITY.md

@@ -403,7 +403,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.23.x-1.24.x      | 4.1.38.Final          | 2.0.25.Final
 1.25.x-1.27.x      | 4.1.42.Final          | 2.0.26.Final
 1.28.x             | 4.1.45.Final          | 2.0.28.Final
-1.29.x-            | 4.1.48.Final          | 2.0.30.Final
+1.29.x-1.31.x      | 4.1.48.Final          | 2.0.30.Final
+1.32.x-            | 4.1.51.Final          | 2.0.31.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

alts/src/main/java/io/grpc/alts/internal/AltsFraming.java

@@ -17,6 +17,7 @@
 package io.grpc.alts.internal;
 
 import com.google.common.base.Preconditions;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.GeneralSecurityException;
@@ -63,10 +64,10 @@ static ByteBuffer toFrame(ByteBuffer input, int dataSize) throws GeneralSecurity
     }
     Producer producer = new Producer();
     ByteBuffer inputAlias = input.duplicate();
-    inputAlias.limit(input.position() + dataSize);
+    ((Buffer) inputAlias).limit(input.position() + dataSize);
     producer.readBytes(inputAlias);
     producer.flush();
-    input.position(inputAlias.position());
+    ((Buffer) input).position(inputAlias.position());
     ByteBuffer output = producer.getRawFrame();
     return output;
   }
@@ -166,10 +167,10 @@ void flush() throws GeneralSecurityException {
       int frameLength = buffer.position() + getFrameSuffixLength();
 
       // Set the limit and move to the start.
-      buffer.flip();
+      ((Buffer) buffer).flip();
 
       // Advance the limit to allow a crypto suffix.
-      buffer.limit(buffer.limit() + getFrameSuffixLength());
+      ((Buffer) buffer).limit(buffer.limit() + getFrameSuffixLength());
 
       // Write the data length and the message type.
       int dataLength = frameLength - FRAME_LENGTH_HEADER_SIZE;
@@ -178,17 +179,17 @@ void flush() throws GeneralSecurityException {
       buffer.putInt(MESSAGE_TYPE);
 
       // Move the position back to 0, the frame is ready.
-      buffer.position(0);
+      ((Buffer) buffer).position(0);
       isComplete = true;
     }
 
     /** Resets the state, preparing to construct a new frame. Must be called between frames. */
     private void reset() {
-      buffer.clear();
+      ((Buffer) buffer).clear();
 
       // Save some space for framing, we'll fill that in later.
-      buffer.position(getFramePrefixLength());
-      buffer.limit(buffer.limit() - getFrameSuffixLength());
+      ((Buffer) buffer).position(getFramePrefixLength());
+      ((Buffer) buffer).limit(buffer.limit() - getFrameSuffixLength());
 
       isComplete = false;
     }
@@ -279,7 +280,7 @@ public boolean readBytes(ByteBuffer input) throws GeneralSecurityException {
       // internal buffer is large enough.
       if (buffer.position() == FRAME_LENGTH_HEADER_SIZE && input.hasRemaining()) {
         ByteBuffer bufferAlias = buffer.duplicate();
-        bufferAlias.flip();
+        ((Buffer) bufferAlias).flip();
         bufferAlias.order(ByteOrder.LITTLE_ENDIAN);
         int dataLength = bufferAlias.getInt();
         if (dataLength < FRAME_MESSAGE_TYPE_HEADER_SIZE || dataLength > MAX_DATA_LENGTH) {
@@ -292,15 +293,15 @@ public boolean readBytes(ByteBuffer input) throws GeneralSecurityException {
           buffer.order(ByteOrder.LITTLE_ENDIAN);
           buffer.putInt(dataLength);
         }
-        buffer.limit(frameLength);
+        ((Buffer) buffer).limit(frameLength);
       }
 
       // TODO: Similarly extract and check message type.
 
       // Read the remaining data into the internal buffer.
       copy(buffer, input);
       if (!buffer.hasRemaining()) {
-        buffer.flip();
+        ((Buffer) buffer).flip();
         isComplete = true;
       }
       return isComplete;
@@ -323,7 +324,7 @@ public boolean isComplete() {
 
     /** Resets the state, preparing to parse a new frame. Must be called between frames. */
     private void reset() {
-      buffer.clear();
+      ((Buffer) buffer).clear();
       isComplete = false;
     }
 
@@ -356,9 +357,9 @@ private static void copy(ByteBuffer dst, ByteBuffer src) {
       } else {
         int count = Math.min(dst.remaining(), src.remaining());
         ByteBuffer slice = src.slice();
-        slice.limit(count);
+        ((Buffer) slice).limit(count);
         dst.put(slice);
-        src.position(src.position() + count);
+        ((Buffer) src).position(src.position() + count);
       }
     }
   }

alts/src/main/java/io/grpc/alts/internal/AltsHandshakerClient.java

@@ -23,6 +23,7 @@
 import io.grpc.Status;
 import io.grpc.alts.internal.HandshakerServiceGrpc.HandshakerServiceStub;
 import java.io.IOException;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.util.logging.Level;
@@ -199,7 +200,7 @@ public ByteBuffer startServerHandshake(ByteBuffer inBytes) throws GeneralSecurit
       throw new GeneralSecurityException(e);
     }
     handleResponse(resp);
-    inBytes.position(inBytes.position() + resp.getBytesConsumed());
+    ((Buffer) inBytes).position(inBytes.position() + resp.getBytesConsumed());
     return resp.getOutFrames().asReadOnlyByteBuffer();
   }
 
@@ -227,7 +228,7 @@ public ByteBuffer next(ByteBuffer inBytes) throws GeneralSecurityException {
       throw new GeneralSecurityException(e);
     }
     handleResponse(resp);
-    inBytes.position(inBytes.position() + resp.getBytesConsumed());
+    ((Buffer) inBytes).position(inBytes.position() + resp.getBytesConsumed());
     return resp.getOutFrames().asReadOnlyByteBuffer();
   }
 

alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java

@@ -22,6 +22,7 @@
 import com.google.common.base.Preconditions;
 import io.grpc.alts.internal.HandshakerServiceGrpc.HandshakerServiceStub;
 import io.netty.buffer.ByteBufAllocator;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
@@ -151,10 +152,10 @@ public void getBytesToSendToPeer(ByteBuffer bytes) throws GeneralSecurityExcepti
     ByteBuffer outputFrameAlias = outputFrame;
     if (outputFrame.remaining() > bytes.remaining()) {
       outputFrameAlias = outputFrame.duplicate();
-      outputFrameAlias.limit(outputFrameAlias.position() + bytes.remaining());
+      ((Buffer) outputFrameAlias).limit(outputFrameAlias.position() + bytes.remaining());
     }
     bytes.put(outputFrameAlias);
-    outputFrame.position(outputFrameAlias.position());
+    ((Buffer) outputFrame).position(outputFrameAlias.position());
   }
 
   /**

alts/src/test/java/io/grpc/alts/internal/AltsFramingTest.java

@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.GeneralSecurityException;
@@ -38,7 +39,7 @@ public void parserFrameLengthNegativeFails() throws GeneralSecurityException {
     buffer.order(ByteOrder.LITTLE_ENDIAN);
     buffer.putInt(-1); // write invalid length
     buffer.put((byte) 0); // write some byte
-    buffer.flip();
+    ((Buffer) buffer).flip();
 
     try {
       parser.readBytes(buffer);
@@ -56,7 +57,7 @@ public void parserFrameLengthSmallerMessageTypeFails() throws GeneralSecurityExc
     buffer.order(ByteOrder.LITTLE_ENDIAN);
     buffer.putInt(AltsFraming.getFrameMessageTypeHeaderSize() - 1); // write invalid length
     buffer.put((byte) 0); // write some byte
-    buffer.flip();
+    ((Buffer) buffer).flip();
 
     try {
       parser.readBytes(buffer);
@@ -74,7 +75,7 @@ public void parserFrameLengthTooLargeFails() throws GeneralSecurityException {
     buffer.order(ByteOrder.LITTLE_ENDIAN);
     buffer.putInt(AltsFraming.getMaxDataLength() + 1); // write invalid length
     buffer.put((byte) 0); // write some byte
-    buffer.flip();
+    ((Buffer) buffer).flip();
 
     try {
       parser.readBytes(buffer);
@@ -97,7 +98,7 @@ public void parserFrameLengthMaxOk() throws GeneralSecurityException {
     buffer.putInt(6); // default message type
     buffer.put(new byte[dataLength - AltsFraming.getFrameMessageTypeHeaderSize()]); // write data
     buffer.put((byte) 0);
-    buffer.flip();
+    ((Buffer) buffer).flip();
 
     parser.readBytes(buffer);
 
@@ -116,7 +117,7 @@ public void parserFrameLengthZeroOk() throws GeneralSecurityException {
     buffer.putInt(dataLength); // write invalid length
     buffer.putInt(6); // default message type
     buffer.put((byte) 0);
-    buffer.flip();
+    ((Buffer) buffer).flip();
 
     parser.readBytes(buffer);
 

alts/src/test/java/io/grpc/alts/internal/AltsHandshakerClientTest.java

@@ -29,6 +29,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import org.junit.Before;
@@ -178,7 +179,7 @@ public void startServerHandshakeWithPrefixBuffer() throws Exception {
         .thenReturn(MockAltsHandshakerResp.getOkResponse(BYTES_CONSUMED));
 
     ByteBuffer inBytes = ByteBuffer.allocate(IN_BYTES_SIZE);
-    inBytes.position(PREFIX_POSITION);
+    ((Buffer) inBytes).position(PREFIX_POSITION);
     ByteBuffer outFrame = handshaker.startServerHandshake(inBytes);
 
     assertEquals(ByteString.copyFrom(outFrame), MockAltsHandshakerResp.getOutFrame());

alts/src/test/java/io/grpc/alts/internal/AltsTsiHandshakerTest.java

@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.protobuf.ByteString;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import org.junit.Before;
 import org.junit.Test;
@@ -112,7 +113,7 @@ public void processBytesFromPeerStartServer() throws Exception {
     verify(mockServer, never()).startClientHandshake();
     verify(mockServer, never()).next(ArgumentMatchers.<ByteBuffer>any());
     // Mock transport buffer all consumed by processBytesFromPeer and there is an output frame.
-    transportBuffer.position(transportBuffer.limit());
+    ((Buffer) transportBuffer).position(transportBuffer.limit());
     when(mockServer.startServerHandshake(transportBuffer)).thenReturn(outputFrame);
     when(mockServer.isFinished()).thenReturn(false);
 
@@ -127,7 +128,7 @@ public void processBytesFromPeerStartServerEmptyOutput() throws Exception {
     verify(mockServer, never()).next(ArgumentMatchers.<ByteBuffer>any());
     // Mock transport buffer all consumed by processBytesFromPeer and output frame is empty.
     // Expect processBytesFromPeer return False, because more data are needed from the peer.
-    transportBuffer.position(transportBuffer.limit());
+    ((Buffer) transportBuffer).position(transportBuffer.limit());
     when(mockServer.startServerHandshake(transportBuffer)).thenReturn(emptyOutputFrame);
     when(mockServer.isFinished()).thenReturn(false);
 
@@ -174,7 +175,7 @@ public void processBytesFromPeerClientNext() throws Exception {
     when(mockClient.isFinished()).thenReturn(false);
 
     handshakerClient.getBytesToSendToPeer(transportBuffer);
-    transportBuffer.position(transportBuffer.limit());
+    ((Buffer) transportBuffer).position(transportBuffer.limit());
     assertFalse(handshakerClient.processBytesFromPeer(transportBuffer));
   }