all: update to protobuf 3.2.0

.travis.yml

@@ -5,7 +5,7 @@ language: java
 env:
   global:
     - GRADLE_OPTS=-Xmx512m
-    - PROTOBUF_VERSION=3.1.0
+    - PROTOBUF_VERSION=3.2.0
     - LDFLAGS=-L/tmp/protobuf/lib
     - CXXFLAGS=-I/tmp/protobuf/include
     - LD_LIBRARY_PATH=/tmp/protobuf/lib

COMPILING.md

@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
 ```
 $ git clone https://github.com/google/protobuf.git
 $ cd protobuf
-$ git checkout v3.1.0
+$ git checkout v3.2.0
 $ ./autogen.sh
 $ ./configure
 $ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
 Gradle to find protobuf:
 ```
 .\gradlew install ^
-    -PvcProtobufInclude=C:\path\to\protobuf-3.1.0\src ^
-    -PvcProtobufLibs=C:\path\to\protobuf-3.1.0\vsprojects\Release ^
+    -PvcProtobufInclude=C:\path\to\protobuf-3.2.0\src ^
+    -PvcProtobufLibs=C:\path\to\protobuf-3.2.0\vsprojects\Release ^
     -PtargetArch=x86_32
 ```
 
 Since specifying those properties every build is bothersome, you can instead
 create ``<project-root>\gradle.properties`` with contents like:
 ```
-vcProtobufInclude=C:\\path\\to\\protobuf-3.1.0\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.1.0\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.2.0\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.2.0\\vsprojects\\Release
 targetArch=x86_32
 ```
 

android-interop-testing/app/build.gradle

@@ -28,7 +28,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.1.0'
+        artifact = 'com.google.protobuf:protoc:3.2.0'
     }
     plugins {
         grpc {

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java

@@ -19,12 +19,12 @@ public final class Payloads {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional int32 req_size = 1;</code>
+     * <code>int32 req_size = 1;</code>
      */
     int getReqSize();
 
     /**
-     * <code>optional int32 resp_size = 2;</code>
+     * <code>int32 resp_size = 2;</code>
      */
     int getRespSize();
   }
@@ -105,7 +105,7 @@ public final class Payloads {
     public static final int REQ_SIZE_FIELD_NUMBER = 1;
     private int reqSize_;
     /**
-     * <code>optional int32 req_size = 1;</code>
+     * <code>int32 req_size = 1;</code>
      */
     public int getReqSize() {
       return reqSize_;
@@ -114,7 +114,7 @@ public final class Payloads {
     public static final int RESP_SIZE_FIELD_NUMBER = 2;
     private int respSize_;
     /**
-     * <code>optional int32 resp_size = 2;</code>
+     * <code>int32 resp_size = 2;</code>
      */
     public int getRespSize() {
       return respSize_;
@@ -182,7 +182,7 @@ public final class Payloads {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + REQ_SIZE_FIELD_NUMBER;
       hash = (53 * hash) + getReqSize();
       hash = (37 * hash) + RESP_SIZE_FIELD_NUMBER;
@@ -408,13 +408,13 @@ public final class Payloads {
 
       private int reqSize_ ;
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public int getReqSize() {
         return reqSize_;
       }
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public Builder setReqSize(int value) {
         
@@ -423,7 +423,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public Builder clearReqSize() {
         
@@ -434,13 +434,13 @@ public final class Payloads {
 
       private int respSize_ ;
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public int getRespSize() {
         return respSize_;
       }
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public Builder setRespSize(int value) {
         
@@ -449,7 +449,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public Builder clearRespSize() {
         
@@ -511,12 +511,12 @@ public final class Payloads {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional int32 req_size = 1;</code>
+     * <code>int32 req_size = 1;</code>
      */
     int getReqSize();
 
     /**
-     * <code>optional int32 resp_size = 2;</code>
+     * <code>int32 resp_size = 2;</code>
      */
     int getRespSize();
   }
@@ -597,7 +597,7 @@ public final class Payloads {
     public static final int REQ_SIZE_FIELD_NUMBER = 1;
     private int reqSize_;
     /**
-     * <code>optional int32 req_size = 1;</code>
+     * <code>int32 req_size = 1;</code>
      */
     public int getReqSize() {
       return reqSize_;
@@ -606,7 +606,7 @@ public final class Payloads {
     public static final int RESP_SIZE_FIELD_NUMBER = 2;
     private int respSize_;
     /**
-     * <code>optional int32 resp_size = 2;</code>
+     * <code>int32 resp_size = 2;</code>
      */
     public int getRespSize() {
       return respSize_;
@@ -674,7 +674,7 @@ public final class Payloads {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + REQ_SIZE_FIELD_NUMBER;
       hash = (53 * hash) + getReqSize();
       hash = (37 * hash) + RESP_SIZE_FIELD_NUMBER;
@@ -900,13 +900,13 @@ public final class Payloads {
 
       private int reqSize_ ;
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public int getReqSize() {
         return reqSize_;
       }
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public Builder setReqSize(int value) {
         
@@ -915,7 +915,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional int32 req_size = 1;</code>
+       * <code>int32 req_size = 1;</code>
        */
       public Builder clearReqSize() {
         
@@ -926,13 +926,13 @@ public final class Payloads {
 
       private int respSize_ ;
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public int getRespSize() {
         return respSize_;
       }
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public Builder setRespSize(int value) {
         
@@ -941,7 +941,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional int32 resp_size = 2;</code>
+       * <code>int32 resp_size = 2;</code>
        */
       public Builder clearRespSize() {
         
@@ -1112,7 +1112,7 @@ public final class Payloads {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1378,29 +1378,29 @@ public final class Payloads {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
     io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams();
     /**
-     * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
     io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder getBytebufParamsOrBuilder();
 
     /**
-     * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
     io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams();
     /**
-     * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
     io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder getSimpleParamsOrBuilder();
 
     /**
-     * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
     io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams();
     /**
-     * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
     io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder getComplexParamsOrBuilder();
 
@@ -1552,7 +1552,7 @@ public final class Payloads {
 
     public static final int BYTEBUF_PARAMS_FIELD_NUMBER = 1;
     /**
-     * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams() {
       if (payloadCase_ == 1) {
@@ -1561,7 +1561,7 @@ public final class Payloads {
       return io.grpc.benchmarks.proto.Payloads.ByteBufferParams.getDefaultInstance();
     }
     /**
-     * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder getBytebufParamsOrBuilder() {
       if (payloadCase_ == 1) {
@@ -1572,7 +1572,7 @@ public final class Payloads {
 
     public static final int SIMPLE_PARAMS_FIELD_NUMBER = 2;
     /**
-     * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams() {
       if (payloadCase_ == 2) {
@@ -1581,7 +1581,7 @@ public final class Payloads {
       return io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.getDefaultInstance();
     }
     /**
-     * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder getSimpleParamsOrBuilder() {
       if (payloadCase_ == 2) {
@@ -1592,7 +1592,7 @@ public final class Payloads {
 
     public static final int COMPLEX_PARAMS_FIELD_NUMBER = 3;
     /**
-     * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams() {
       if (payloadCase_ == 3) {
@@ -1601,7 +1601,7 @@ public final class Payloads {
       return io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.getDefaultInstance();
     }
     /**
-     * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
     public io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder getComplexParamsOrBuilder() {
       if (payloadCase_ == 3) {
@@ -1694,7 +1694,7 @@ public final class Payloads {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       switch (payloadCase_) {
         case 1:
           hash = (37 * hash) + BYTEBUF_PARAMS_FIELD_NUMBER;
@@ -1977,7 +1977,7 @@ public final class Payloads {
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ByteBufferParams, io.grpc.benchmarks.proto.Payloads.ByteBufferParams.Builder, io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder> bytebufParamsBuilder_;
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ByteBufferParams getBytebufParams() {
         if (bytebufParamsBuilder_ == null) {
@@ -1993,7 +1993,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public Builder setBytebufParams(io.grpc.benchmarks.proto.Payloads.ByteBufferParams value) {
         if (bytebufParamsBuilder_ == null) {
@@ -2009,7 +2009,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public Builder setBytebufParams(
           io.grpc.benchmarks.proto.Payloads.ByteBufferParams.Builder builderForValue) {
@@ -2023,7 +2023,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public Builder mergeBytebufParams(io.grpc.benchmarks.proto.Payloads.ByteBufferParams value) {
         if (bytebufParamsBuilder_ == null) {
@@ -2045,7 +2045,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public Builder clearBytebufParams() {
         if (bytebufParamsBuilder_ == null) {
@@ -2064,13 +2064,13 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ByteBufferParams.Builder getBytebufParamsBuilder() {
         return getBytebufParamsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder getBytebufParamsOrBuilder() {
         if ((payloadCase_ == 1) && (bytebufParamsBuilder_ != null)) {
@@ -2083,7 +2083,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ByteBufferParams, io.grpc.benchmarks.proto.Payloads.ByteBufferParams.Builder, io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder> 
@@ -2107,7 +2107,7 @@ public final class Payloads {
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.SimpleProtoParams, io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder> simpleParamsBuilder_;
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.SimpleProtoParams getSimpleParams() {
         if (simpleParamsBuilder_ == null) {
@@ -2123,7 +2123,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public Builder setSimpleParams(io.grpc.benchmarks.proto.Payloads.SimpleProtoParams value) {
         if (simpleParamsBuilder_ == null) {
@@ -2139,7 +2139,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public Builder setSimpleParams(
           io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.Builder builderForValue) {
@@ -2153,7 +2153,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public Builder mergeSimpleParams(io.grpc.benchmarks.proto.Payloads.SimpleProtoParams value) {
         if (simpleParamsBuilder_ == null) {
@@ -2175,7 +2175,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public Builder clearSimpleParams() {
         if (simpleParamsBuilder_ == null) {
@@ -2194,13 +2194,13 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.Builder getSimpleParamsBuilder() {
         return getSimpleParamsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder getSimpleParamsOrBuilder() {
         if ((payloadCase_ == 2) && (simpleParamsBuilder_ != null)) {
@@ -2213,7 +2213,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.SimpleProtoParams, io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder> 
@@ -2237,7 +2237,7 @@ public final class Payloads {
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ComplexProtoParams, io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder> complexParamsBuilder_;
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ComplexProtoParams getComplexParams() {
         if (complexParamsBuilder_ == null) {
@@ -2253,7 +2253,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public Builder setComplexParams(io.grpc.benchmarks.proto.Payloads.ComplexProtoParams value) {
         if (complexParamsBuilder_ == null) {
@@ -2269,7 +2269,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public Builder setComplexParams(
           io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.Builder builderForValue) {
@@ -2283,7 +2283,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public Builder mergeComplexParams(io.grpc.benchmarks.proto.Payloads.ComplexProtoParams value) {
         if (complexParamsBuilder_ == null) {
@@ -2305,7 +2305,7 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public Builder clearComplexParams() {
         if (complexParamsBuilder_ == null) {
@@ -2324,13 +2324,13 @@ public final class Payloads {
         return this;
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.Builder getComplexParamsBuilder() {
         return getComplexParamsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       public io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder getComplexParamsOrBuilder() {
         if ((payloadCase_ == 3) && (complexParamsBuilder_ != null)) {
@@ -2343,7 +2343,7 @@ public final class Payloads {
         }
       }
       /**
-       * <code>optional .grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ComplexProtoParams, io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder> 

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java

@@ -23,7 +23,7 @@ public final class Stats {
      * wall clock time change in seconds since last reset
      * </pre>
      *
-     * <code>optional double time_elapsed = 1;</code>
+     * <code>double time_elapsed = 1;</code>
      */
     double getTimeElapsed();
 
@@ -32,7 +32,7 @@ public final class Stats {
      * change in user time (in seconds) used by the server since last reset
      * </pre>
      *
-     * <code>optional double time_user = 2;</code>
+     * <code>double time_user = 2;</code>
      */
     double getTimeUser();
 
@@ -42,7 +42,7 @@ public final class Stats {
      * threads since last reset
      * </pre>
      *
-     * <code>optional double time_system = 3;</code>
+     * <code>double time_system = 3;</code>
      */
     double getTimeSystem();
   }
@@ -133,7 +133,7 @@ public final class Stats {
      * wall clock time change in seconds since last reset
      * </pre>
      *
-     * <code>optional double time_elapsed = 1;</code>
+     * <code>double time_elapsed = 1;</code>
      */
     public double getTimeElapsed() {
       return timeElapsed_;
@@ -146,7 +146,7 @@ public final class Stats {
      * change in user time (in seconds) used by the server since last reset
      * </pre>
      *
-     * <code>optional double time_user = 2;</code>
+     * <code>double time_user = 2;</code>
      */
     public double getTimeUser() {
       return timeUser_;
@@ -160,7 +160,7 @@ public final class Stats {
      * threads since last reset
      * </pre>
      *
-     * <code>optional double time_system = 3;</code>
+     * <code>double time_system = 3;</code>
      */
     public double getTimeSystem() {
       return timeSystem_;
@@ -243,7 +243,7 @@ public final class Stats {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TIME_ELAPSED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTimeElapsed()));
@@ -484,7 +484,7 @@ public final class Stats {
        * wall clock time change in seconds since last reset
        * </pre>
        *
-       * <code>optional double time_elapsed = 1;</code>
+       * <code>double time_elapsed = 1;</code>
        */
       public double getTimeElapsed() {
         return timeElapsed_;
@@ -494,7 +494,7 @@ public final class Stats {
        * wall clock time change in seconds since last reset
        * </pre>
        *
-       * <code>optional double time_elapsed = 1;</code>
+       * <code>double time_elapsed = 1;</code>
        */
       public Builder setTimeElapsed(double value) {
         
@@ -507,7 +507,7 @@ public final class Stats {
        * wall clock time change in seconds since last reset
        * </pre>
        *
-       * <code>optional double time_elapsed = 1;</code>
+       * <code>double time_elapsed = 1;</code>
        */
       public Builder clearTimeElapsed() {
         
@@ -522,7 +522,7 @@ public final class Stats {
        * change in user time (in seconds) used by the server since last reset
        * </pre>
        *
-       * <code>optional double time_user = 2;</code>
+       * <code>double time_user = 2;</code>
        */
       public double getTimeUser() {
         return timeUser_;
@@ -532,7 +532,7 @@ public final class Stats {
        * change in user time (in seconds) used by the server since last reset
        * </pre>
        *
-       * <code>optional double time_user = 2;</code>
+       * <code>double time_user = 2;</code>
        */
       public Builder setTimeUser(double value) {
         
@@ -545,7 +545,7 @@ public final class Stats {
        * change in user time (in seconds) used by the server since last reset
        * </pre>
        *
-       * <code>optional double time_user = 2;</code>
+       * <code>double time_user = 2;</code>
        */
       public Builder clearTimeUser() {
         
@@ -561,7 +561,7 @@ public final class Stats {
        * threads since last reset
        * </pre>
        *
-       * <code>optional double time_system = 3;</code>
+       * <code>double time_system = 3;</code>
        */
       public double getTimeSystem() {
         return timeSystem_;
@@ -572,7 +572,7 @@ public final class Stats {
        * threads since last reset
        * </pre>
        *
-       * <code>optional double time_system = 3;</code>
+       * <code>double time_system = 3;</code>
        */
       public Builder setTimeSystem(double value) {
         
@@ -586,7 +586,7 @@ public final class Stats {
        * threads since last reset
        * </pre>
        *
-       * <code>optional double time_system = 3;</code>
+       * <code>double time_system = 3;</code>
        */
       public Builder clearTimeSystem() {
         
@@ -652,7 +652,7 @@ public final class Stats {
      * first bucket is [0, 1 + resolution)
      * </pre>
      *
-     * <code>optional double resolution = 1;</code>
+     * <code>double resolution = 1;</code>
      */
     double getResolution();
 
@@ -661,7 +661,7 @@ public final class Stats {
      * use enough buckets to allow this value
      * </pre>
      *
-     * <code>optional double max_possible = 2;</code>
+     * <code>double max_possible = 2;</code>
      */
     double getMaxPossible();
   }
@@ -750,7 +750,7 @@ public final class Stats {
      * first bucket is [0, 1 + resolution)
      * </pre>
      *
-     * <code>optional double resolution = 1;</code>
+     * <code>double resolution = 1;</code>
      */
     public double getResolution() {
       return resolution_;
@@ -763,7 +763,7 @@ public final class Stats {
      * use enough buckets to allow this value
      * </pre>
      *
-     * <code>optional double max_possible = 2;</code>
+     * <code>double max_possible = 2;</code>
      */
     public double getMaxPossible() {
       return maxPossible_;
@@ -835,7 +835,7 @@ public final class Stats {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RESOLUTION_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getResolution()));
@@ -1071,7 +1071,7 @@ public final class Stats {
        * first bucket is [0, 1 + resolution)
        * </pre>
        *
-       * <code>optional double resolution = 1;</code>
+       * <code>double resolution = 1;</code>
        */
       public double getResolution() {
         return resolution_;
@@ -1081,7 +1081,7 @@ public final class Stats {
        * first bucket is [0, 1 + resolution)
        * </pre>
        *
-       * <code>optional double resolution = 1;</code>
+       * <code>double resolution = 1;</code>
        */
       public Builder setResolution(double value) {
         
@@ -1094,7 +1094,7 @@ public final class Stats {
        * first bucket is [0, 1 + resolution)
        * </pre>
        *
-       * <code>optional double resolution = 1;</code>
+       * <code>double resolution = 1;</code>
        */
       public Builder clearResolution() {
         
@@ -1109,7 +1109,7 @@ public final class Stats {
        * use enough buckets to allow this value
        * </pre>
        *
-       * <code>optional double max_possible = 2;</code>
+       * <code>double max_possible = 2;</code>
        */
       public double getMaxPossible() {
         return maxPossible_;
@@ -1119,7 +1119,7 @@ public final class Stats {
        * use enough buckets to allow this value
        * </pre>
        *
-       * <code>optional double max_possible = 2;</code>
+       * <code>double max_possible = 2;</code>
        */
       public Builder setMaxPossible(double value) {
         
@@ -1132,7 +1132,7 @@ public final class Stats {
        * use enough buckets to allow this value
        * </pre>
        *
-       * <code>optional double max_possible = 2;</code>
+       * <code>double max_possible = 2;</code>
        */
       public Builder clearMaxPossible() {
         
@@ -1207,27 +1207,27 @@ public final class Stats {
     int getBucket(int index);
 
     /**
-     * <code>optional double min_seen = 2;</code>
+     * <code>double min_seen = 2;</code>
      */
     double getMinSeen();
 
     /**
-     * <code>optional double max_seen = 3;</code>
+     * <code>double max_seen = 3;</code>
      */
     double getMaxSeen();
 
     /**
-     * <code>optional double sum = 4;</code>
+     * <code>double sum = 4;</code>
      */
     double getSum();
 
     /**
-     * <code>optional double sum_of_squares = 5;</code>
+     * <code>double sum_of_squares = 5;</code>
      */
     double getSumOfSquares();
 
     /**
-     * <code>optional double count = 6;</code>
+     * <code>double count = 6;</code>
      */
     double getCount();
   }
@@ -1379,7 +1379,7 @@ public final class Stats {
     public static final int MIN_SEEN_FIELD_NUMBER = 2;
     private double minSeen_;
     /**
-     * <code>optional double min_seen = 2;</code>
+     * <code>double min_seen = 2;</code>
      */
     public double getMinSeen() {
       return minSeen_;
@@ -1388,7 +1388,7 @@ public final class Stats {
     public static final int MAX_SEEN_FIELD_NUMBER = 3;
     private double maxSeen_;
     /**
-     * <code>optional double max_seen = 3;</code>
+     * <code>double max_seen = 3;</code>
      */
     public double getMaxSeen() {
       return maxSeen_;
@@ -1397,7 +1397,7 @@ public final class Stats {
     public static final int SUM_FIELD_NUMBER = 4;
     private double sum_;
     /**
-     * <code>optional double sum = 4;</code>
+     * <code>double sum = 4;</code>
      */
     public double getSum() {
       return sum_;
@@ -1406,7 +1406,7 @@ public final class Stats {
     public static final int SUM_OF_SQUARES_FIELD_NUMBER = 5;
     private double sumOfSquares_;
     /**
-     * <code>optional double sum_of_squares = 5;</code>
+     * <code>double sum_of_squares = 5;</code>
      */
     public double getSumOfSquares() {
       return sumOfSquares_;
@@ -1415,7 +1415,7 @@ public final class Stats {
     public static final int COUNT_FIELD_NUMBER = 6;
     private double count_;
     /**
-     * <code>optional double count = 6;</code>
+     * <code>double count = 6;</code>
      */
     public double getCount() {
       return count_;
@@ -1544,7 +1544,7 @@ public final class Stats {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       if (getBucketCount() > 0) {
         hash = (37 * hash) + BUCKET_FIELD_NUMBER;
         hash = (53 * hash) + getBucketList().hashCode();
@@ -1894,13 +1894,13 @@ public final class Stats {
 
       private double minSeen_ ;
       /**
-       * <code>optional double min_seen = 2;</code>
+       * <code>double min_seen = 2;</code>
        */
       public double getMinSeen() {
         return minSeen_;
       }
       /**
-       * <code>optional double min_seen = 2;</code>
+       * <code>double min_seen = 2;</code>
        */
       public Builder setMinSeen(double value) {
         
@@ -1909,7 +1909,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double min_seen = 2;</code>
+       * <code>double min_seen = 2;</code>
        */
       public Builder clearMinSeen() {
         
@@ -1920,13 +1920,13 @@ public final class Stats {
 
       private double maxSeen_ ;
       /**
-       * <code>optional double max_seen = 3;</code>
+       * <code>double max_seen = 3;</code>
        */
       public double getMaxSeen() {
         return maxSeen_;
       }
       /**
-       * <code>optional double max_seen = 3;</code>
+       * <code>double max_seen = 3;</code>
        */
       public Builder setMaxSeen(double value) {
         
@@ -1935,7 +1935,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double max_seen = 3;</code>
+       * <code>double max_seen = 3;</code>
        */
       public Builder clearMaxSeen() {
         
@@ -1946,13 +1946,13 @@ public final class Stats {
 
       private double sum_ ;
       /**
-       * <code>optional double sum = 4;</code>
+       * <code>double sum = 4;</code>
        */
       public double getSum() {
         return sum_;
       }
       /**
-       * <code>optional double sum = 4;</code>
+       * <code>double sum = 4;</code>
        */
       public Builder setSum(double value) {
         
@@ -1961,7 +1961,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double sum = 4;</code>
+       * <code>double sum = 4;</code>
        */
       public Builder clearSum() {
         
@@ -1972,13 +1972,13 @@ public final class Stats {
 
       private double sumOfSquares_ ;
       /**
-       * <code>optional double sum_of_squares = 5;</code>
+       * <code>double sum_of_squares = 5;</code>
        */
       public double getSumOfSquares() {
         return sumOfSquares_;
       }
       /**
-       * <code>optional double sum_of_squares = 5;</code>
+       * <code>double sum_of_squares = 5;</code>
        */
       public Builder setSumOfSquares(double value) {
         
@@ -1987,7 +1987,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double sum_of_squares = 5;</code>
+       * <code>double sum_of_squares = 5;</code>
        */
       public Builder clearSumOfSquares() {
         
@@ -1998,13 +1998,13 @@ public final class Stats {
 
       private double count_ ;
       /**
-       * <code>optional double count = 6;</code>
+       * <code>double count = 6;</code>
        */
       public double getCount() {
         return count_;
       }
       /**
-       * <code>optional double count = 6;</code>
+       * <code>double count = 6;</code>
        */
       public Builder setCount(double value) {
         
@@ -2013,7 +2013,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double count = 6;</code>
+       * <code>double count = 6;</code>
        */
       public Builder clearCount() {
         
@@ -2079,7 +2079,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     boolean hasLatencies();
     /**
@@ -2087,7 +2087,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     io.grpc.benchmarks.proto.Stats.HistogramData getLatencies();
     /**
@@ -2095,7 +2095,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     io.grpc.benchmarks.proto.Stats.HistogramDataOrBuilder getLatenciesOrBuilder();
 
@@ -2104,17 +2104,17 @@ public final class Stats {
      * See ServerStats for details.
      * </pre>
      *
-     * <code>optional double time_elapsed = 2;</code>
+     * <code>double time_elapsed = 2;</code>
      */
     double getTimeElapsed();
 
     /**
-     * <code>optional double time_user = 3;</code>
+     * <code>double time_user = 3;</code>
      */
     double getTimeUser();
 
     /**
-     * <code>optional double time_system = 4;</code>
+     * <code>double time_system = 4;</code>
      */
     double getTimeSystem();
   }
@@ -2218,7 +2218,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     public boolean hasLatencies() {
       return latencies_ != null;
@@ -2228,7 +2228,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     public io.grpc.benchmarks.proto.Stats.HistogramData getLatencies() {
       return latencies_ == null ? io.grpc.benchmarks.proto.Stats.HistogramData.getDefaultInstance() : latencies_;
@@ -2238,7 +2238,7 @@ public final class Stats {
      * Latency histogram. Data points are in nanoseconds.
      * </pre>
      *
-     * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+     * <code>.grpc.testing.HistogramData latencies = 1;</code>
      */
     public io.grpc.benchmarks.proto.Stats.HistogramDataOrBuilder getLatenciesOrBuilder() {
       return getLatencies();
@@ -2251,7 +2251,7 @@ public final class Stats {
      * See ServerStats for details.
      * </pre>
      *
-     * <code>optional double time_elapsed = 2;</code>
+     * <code>double time_elapsed = 2;</code>
      */
     public double getTimeElapsed() {
       return timeElapsed_;
@@ -2260,7 +2260,7 @@ public final class Stats {
     public static final int TIME_USER_FIELD_NUMBER = 3;
     private double timeUser_;
     /**
-     * <code>optional double time_user = 3;</code>
+     * <code>double time_user = 3;</code>
      */
     public double getTimeUser() {
       return timeUser_;
@@ -2269,7 +2269,7 @@ public final class Stats {
     public static final int TIME_SYSTEM_FIELD_NUMBER = 4;
     private double timeSystem_;
     /**
-     * <code>optional double time_system = 4;</code>
+     * <code>double time_system = 4;</code>
      */
     public double getTimeSystem() {
       return timeSystem_;
@@ -2364,7 +2364,7 @@ public final class Stats {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       if (hasLatencies()) {
         hash = (37 * hash) + LATENCIES_FIELD_NUMBER;
         hash = (53 * hash) + getLatencies().hashCode();
@@ -2625,7 +2625,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public boolean hasLatencies() {
         return latenciesBuilder_ != null || latencies_ != null;
@@ -2635,7 +2635,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public io.grpc.benchmarks.proto.Stats.HistogramData getLatencies() {
         if (latenciesBuilder_ == null) {
@@ -2649,7 +2649,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public Builder setLatencies(io.grpc.benchmarks.proto.Stats.HistogramData value) {
         if (latenciesBuilder_ == null) {
@@ -2669,7 +2669,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public Builder setLatencies(
           io.grpc.benchmarks.proto.Stats.HistogramData.Builder builderForValue) {
@@ -2687,7 +2687,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public Builder mergeLatencies(io.grpc.benchmarks.proto.Stats.HistogramData value) {
         if (latenciesBuilder_ == null) {
@@ -2709,7 +2709,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public Builder clearLatencies() {
         if (latenciesBuilder_ == null) {
@@ -2727,7 +2727,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public io.grpc.benchmarks.proto.Stats.HistogramData.Builder getLatenciesBuilder() {
         
@@ -2739,7 +2739,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       public io.grpc.benchmarks.proto.Stats.HistogramDataOrBuilder getLatenciesOrBuilder() {
         if (latenciesBuilder_ != null) {
@@ -2754,7 +2754,7 @@ public final class Stats {
        * Latency histogram. Data points are in nanoseconds.
        * </pre>
        *
-       * <code>optional .grpc.testing.HistogramData latencies = 1;</code>
+       * <code>.grpc.testing.HistogramData latencies = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Stats.HistogramData, io.grpc.benchmarks.proto.Stats.HistogramData.Builder, io.grpc.benchmarks.proto.Stats.HistogramDataOrBuilder> 
@@ -2776,7 +2776,7 @@ public final class Stats {
        * See ServerStats for details.
        * </pre>
        *
-       * <code>optional double time_elapsed = 2;</code>
+       * <code>double time_elapsed = 2;</code>
        */
       public double getTimeElapsed() {
         return timeElapsed_;
@@ -2786,7 +2786,7 @@ public final class Stats {
        * See ServerStats for details.
        * </pre>
        *
-       * <code>optional double time_elapsed = 2;</code>
+       * <code>double time_elapsed = 2;</code>
        */
       public Builder setTimeElapsed(double value) {
         
@@ -2799,7 +2799,7 @@ public final class Stats {
        * See ServerStats for details.
        * </pre>
        *
-       * <code>optional double time_elapsed = 2;</code>
+       * <code>double time_elapsed = 2;</code>
        */
       public Builder clearTimeElapsed() {
         
@@ -2810,13 +2810,13 @@ public final class Stats {
 
       private double timeUser_ ;
       /**
-       * <code>optional double time_user = 3;</code>
+       * <code>double time_user = 3;</code>
        */
       public double getTimeUser() {
         return timeUser_;
       }
       /**
-       * <code>optional double time_user = 3;</code>
+       * <code>double time_user = 3;</code>
        */
       public Builder setTimeUser(double value) {
         
@@ -2825,7 +2825,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double time_user = 3;</code>
+       * <code>double time_user = 3;</code>
        */
       public Builder clearTimeUser() {
         
@@ -2836,13 +2836,13 @@ public final class Stats {
 
       private double timeSystem_ ;
       /**
-       * <code>optional double time_system = 4;</code>
+       * <code>double time_system = 4;</code>
        */
       public double getTimeSystem() {
         return timeSystem_;
       }
       /**
-       * <code>optional double time_system = 4;</code>
+       * <code>double time_system = 4;</code>
        */
       public Builder setTimeSystem(double value) {
         
@@ -2851,7 +2851,7 @@ public final class Stats {
         return this;
       }
       /**
-       * <code>optional double time_system = 4;</code>
+       * <code>double time_system = 4;</code>
        */
       public Builder clearTimeSystem() {
         

build.gradle

@@ -62,7 +62,7 @@ subprojects {
         javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
 
         guavaVersion = '20.0'
-        protobufVersion = '3.1.0'
+        protobufVersion = '3.2.0'
         protobufNanoVersion = '3.0.0-alpha-5'
 
         configureProtoCompilation = {

buildscripts/make_dependencies.bat

@@ -4,7 +4,7 @@ REM 7za is in http://www.7-zip.org/a/7z1507-extra.7z
 REM Prerequisite:
 REM   7za.exe in current directory or PATH
 
-set PROTOBUF_VER=3.1.0
+set PROTOBUF_VER=3.2.0
 set CMAKE_NAME=cmake-3.3.2-win32-x86
 
 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (

compiler/Dockerfile

@@ -2,7 +2,7 @@ FROM protoc-artifacts:latest
 
 RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \
     git fetch && \
-    git checkout v3.1.0 && \
+    git checkout v3.2.0 && \
     ./autogen.sh && \
     CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 && \
     make clean && make -j$(nproc) && make -j$(nproc) install"'

examples/android/helloworld/app/build.gradle

@@ -27,7 +27,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.1.0'
+        artifact = 'com.google.protobuf:protoc:3.2.0'
     }
     plugins {
         javalite {

examples/android/routeguide/app/build.gradle

@@ -25,7 +25,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.1.0'
+        artifact = 'com.google.protobuf:protoc:3.2.0'
     }
     plugins {
         javalite {

examples/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 
 protobuf {
   protoc {
-    artifact = 'com.google.protobuf:protoc:3.1.0'
+    artifact = 'com.google.protobuf:protoc:3.2.0'
   }
   plugins {
     grpc {

examples/pom.xml

@@ -55,7 +55,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.5.0</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>

grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java

@@ -95,7 +95,7 @@ public  final class ClientStats extends
    * The total number of requests sent by the client since the last report.
    * </pre>
    *
-   * <code>optional int64 total_requests = 1;</code>
+   * <code>int64 total_requests = 1;</code>
    */
   public long getTotalRequests() {
     return totalRequests_;
@@ -108,7 +108,7 @@ public  final class ClientStats extends
    * The number of client rpc errors since the last report.
    * </pre>
    *
-   * <code>optional int64 client_rpc_errors = 2;</code>
+   * <code>int64 client_rpc_errors = 2;</code>
    */
   public long getClientRpcErrors() {
     return clientRpcErrors_;
@@ -121,7 +121,7 @@ public  final class ClientStats extends
    * The number of dropped requests since the last report.
    * </pre>
    *
-   * <code>optional int64 dropped_requests = 3;</code>
+   * <code>int64 dropped_requests = 3;</code>
    */
   public long getDroppedRequests() {
     return droppedRequests_;
@@ -198,7 +198,7 @@ public  final class ClientStats extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + TOTAL_REQUESTS_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getTotalRequests());
@@ -444,7 +444,7 @@ public  final class ClientStats extends
      * The total number of requests sent by the client since the last report.
      * </pre>
      *
-     * <code>optional int64 total_requests = 1;</code>
+     * <code>int64 total_requests = 1;</code>
      */
     public long getTotalRequests() {
       return totalRequests_;
@@ -454,7 +454,7 @@ public  final class ClientStats extends
      * The total number of requests sent by the client since the last report.
      * </pre>
      *
-     * <code>optional int64 total_requests = 1;</code>
+     * <code>int64 total_requests = 1;</code>
      */
     public Builder setTotalRequests(long value) {
       
@@ -467,7 +467,7 @@ public  final class ClientStats extends
      * The total number of requests sent by the client since the last report.
      * </pre>
      *
-     * <code>optional int64 total_requests = 1;</code>
+     * <code>int64 total_requests = 1;</code>
      */
     public Builder clearTotalRequests() {
       
@@ -482,7 +482,7 @@ public  final class ClientStats extends
      * The number of client rpc errors since the last report.
      * </pre>
      *
-     * <code>optional int64 client_rpc_errors = 2;</code>
+     * <code>int64 client_rpc_errors = 2;</code>
      */
     public long getClientRpcErrors() {
       return clientRpcErrors_;
@@ -492,7 +492,7 @@ public  final class ClientStats extends
      * The number of client rpc errors since the last report.
      * </pre>
      *
-     * <code>optional int64 client_rpc_errors = 2;</code>
+     * <code>int64 client_rpc_errors = 2;</code>
      */
     public Builder setClientRpcErrors(long value) {
       
@@ -505,7 +505,7 @@ public  final class ClientStats extends
      * The number of client rpc errors since the last report.
      * </pre>
      *
-     * <code>optional int64 client_rpc_errors = 2;</code>
+     * <code>int64 client_rpc_errors = 2;</code>
      */
     public Builder clearClientRpcErrors() {
       
@@ -520,7 +520,7 @@ public  final class ClientStats extends
      * The number of dropped requests since the last report.
      * </pre>
      *
-     * <code>optional int64 dropped_requests = 3;</code>
+     * <code>int64 dropped_requests = 3;</code>
      */
     public long getDroppedRequests() {
       return droppedRequests_;
@@ -530,7 +530,7 @@ public  final class ClientStats extends
      * The number of dropped requests since the last report.
      * </pre>
      *
-     * <code>optional int64 dropped_requests = 3;</code>
+     * <code>int64 dropped_requests = 3;</code>
      */
     public Builder setDroppedRequests(long value) {
       
@@ -543,7 +543,7 @@ public  final class ClientStats extends
      * The number of dropped requests since the last report.
      * </pre>
      *
-     * <code>optional int64 dropped_requests = 3;</code>
+     * <code>int64 dropped_requests = 3;</code>
      */
     public Builder clearDroppedRequests() {
       

grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsOrBuilder.java

@@ -12,7 +12,7 @@ public interface ClientStatsOrBuilder extends
    * The total number of requests sent by the client since the last report.
    * </pre>
    *
-   * <code>optional int64 total_requests = 1;</code>
+   * <code>int64 total_requests = 1;</code>
    */
   long getTotalRequests();
 
@@ -21,7 +21,7 @@ public interface ClientStatsOrBuilder extends
    * The number of client rpc errors since the last report.
    * </pre>
    *
-   * <code>optional int64 client_rpc_errors = 2;</code>
+   * <code>int64 client_rpc_errors = 2;</code>
    */
   long getClientRpcErrors();
 
@@ -30,7 +30,7 @@ public interface ClientStatsOrBuilder extends
    * The number of dropped requests since the last report.
    * </pre>
    *
-   * <code>optional int64 dropped_requests = 3;</code>
+   * <code>int64 dropped_requests = 3;</code>
    */
   long getDroppedRequests();
 }

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java

@@ -79,7 +79,7 @@ public  final class InitialLoadBalanceRequest extends
    * Name of load balanced service
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -98,7 +98,7 @@ public  final class InitialLoadBalanceRequest extends
    * Name of load balanced service
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public com.google.protobuf.ByteString
       getNameBytes() {
@@ -166,7 +166,7 @@ public  final class InitialLoadBalanceRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -389,7 +389,7 @@ public  final class InitialLoadBalanceRequest extends
      * Name of load balanced service
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -408,7 +408,7 @@ public  final class InitialLoadBalanceRequest extends
      * Name of load balanced service
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNameBytes() {
@@ -428,7 +428,7 @@ public  final class InitialLoadBalanceRequest extends
      * Name of load balanced service
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setName(
         java.lang.String value) {
@@ -445,7 +445,7 @@ public  final class InitialLoadBalanceRequest extends
      * Name of load balanced service
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder clearName() {
       
@@ -458,7 +458,7 @@ public  final class InitialLoadBalanceRequest extends
      * Name of load balanced service
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setNameBytes(
         com.google.protobuf.ByteString value) {

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java

@@ -12,7 +12,7 @@ public interface InitialLoadBalanceRequestOrBuilder extends
    * Name of load balanced service
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   java.lang.String getName();
   /**
@@ -20,7 +20,7 @@ public interface InitialLoadBalanceRequestOrBuilder extends
    * Name of load balanced service
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   com.google.protobuf.ByteString
       getNameBytes();

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java

@@ -95,7 +95,7 @@ public  final class InitialLoadBalanceResponse extends
    * load_balancer_delegate and call the BalanceLoad method.
    * </pre>
    *
-   * <code>optional string load_balancer_delegate = 1;</code>
+   * <code>string load_balancer_delegate = 1;</code>
    */
   public java.lang.String getLoadBalancerDelegate() {
     java.lang.Object ref = loadBalancerDelegate_;
@@ -117,7 +117,7 @@ public  final class InitialLoadBalanceResponse extends
    * load_balancer_delegate and call the BalanceLoad method.
    * </pre>
    *
-   * <code>optional string load_balancer_delegate = 1;</code>
+   * <code>string load_balancer_delegate = 1;</code>
    */
   public com.google.protobuf.ByteString
       getLoadBalancerDelegateBytes() {
@@ -142,7 +142,7 @@ public  final class InitialLoadBalanceResponse extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   public boolean hasClientStatsReportInterval() {
     return clientStatsReportInterval_ != null;
@@ -154,7 +154,7 @@ public  final class InitialLoadBalanceResponse extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   public com.google.protobuf.Duration getClientStatsReportInterval() {
     return clientStatsReportInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : clientStatsReportInterval_;
@@ -166,7 +166,7 @@ public  final class InitialLoadBalanceResponse extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   public com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder() {
     return getClientStatsReportInterval();
@@ -236,7 +236,7 @@ public  final class InitialLoadBalanceResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + LOAD_BALANCER_DELEGATE_FIELD_NUMBER;
     hash = (53 * hash) + getLoadBalancerDelegate().hashCode();
     if (hasClientStatsReportInterval()) {
@@ -480,7 +480,7 @@ public  final class InitialLoadBalanceResponse extends
      * load_balancer_delegate and call the BalanceLoad method.
      * </pre>
      *
-     * <code>optional string load_balancer_delegate = 1;</code>
+     * <code>string load_balancer_delegate = 1;</code>
      */
     public java.lang.String getLoadBalancerDelegate() {
       java.lang.Object ref = loadBalancerDelegate_;
@@ -502,7 +502,7 @@ public  final class InitialLoadBalanceResponse extends
      * load_balancer_delegate and call the BalanceLoad method.
      * </pre>
      *
-     * <code>optional string load_balancer_delegate = 1;</code>
+     * <code>string load_balancer_delegate = 1;</code>
      */
     public com.google.protobuf.ByteString
         getLoadBalancerDelegateBytes() {
@@ -525,7 +525,7 @@ public  final class InitialLoadBalanceResponse extends
      * load_balancer_delegate and call the BalanceLoad method.
      * </pre>
      *
-     * <code>optional string load_balancer_delegate = 1;</code>
+     * <code>string load_balancer_delegate = 1;</code>
      */
     public Builder setLoadBalancerDelegate(
         java.lang.String value) {
@@ -545,7 +545,7 @@ public  final class InitialLoadBalanceResponse extends
      * load_balancer_delegate and call the BalanceLoad method.
      * </pre>
      *
-     * <code>optional string load_balancer_delegate = 1;</code>
+     * <code>string load_balancer_delegate = 1;</code>
      */
     public Builder clearLoadBalancerDelegate() {
       
@@ -561,7 +561,7 @@ public  final class InitialLoadBalanceResponse extends
      * load_balancer_delegate and call the BalanceLoad method.
      * </pre>
      *
-     * <code>optional string load_balancer_delegate = 1;</code>
+     * <code>string load_balancer_delegate = 1;</code>
      */
     public Builder setLoadBalancerDelegateBytes(
         com.google.protobuf.ByteString value) {
@@ -585,7 +585,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public boolean hasClientStatsReportInterval() {
       return clientStatsReportIntervalBuilder_ != null || clientStatsReportInterval_ != null;
@@ -597,7 +597,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public com.google.protobuf.Duration getClientStatsReportInterval() {
       if (clientStatsReportIntervalBuilder_ == null) {
@@ -613,7 +613,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public Builder setClientStatsReportInterval(com.google.protobuf.Duration value) {
       if (clientStatsReportIntervalBuilder_ == null) {
@@ -635,7 +635,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public Builder setClientStatsReportInterval(
         com.google.protobuf.Duration.Builder builderForValue) {
@@ -655,7 +655,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public Builder mergeClientStatsReportInterval(com.google.protobuf.Duration value) {
       if (clientStatsReportIntervalBuilder_ == null) {
@@ -679,7 +679,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public Builder clearClientStatsReportInterval() {
       if (clientStatsReportIntervalBuilder_ == null) {
@@ -699,7 +699,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public com.google.protobuf.Duration.Builder getClientStatsReportIntervalBuilder() {
       
@@ -713,7 +713,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     public com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder() {
       if (clientStatsReportIntervalBuilder_ != null) {
@@ -730,7 +730,7 @@ public  final class InitialLoadBalanceResponse extends
      * positive.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+     * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java

@@ -15,7 +15,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
    * load_balancer_delegate and call the BalanceLoad method.
    * </pre>
    *
-   * <code>optional string load_balancer_delegate = 1;</code>
+   * <code>string load_balancer_delegate = 1;</code>
    */
   java.lang.String getLoadBalancerDelegate();
   /**
@@ -26,7 +26,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
    * load_balancer_delegate and call the BalanceLoad method.
    * </pre>
    *
-   * <code>optional string load_balancer_delegate = 1;</code>
+   * <code>string load_balancer_delegate = 1;</code>
    */
   com.google.protobuf.ByteString
       getLoadBalancerDelegateBytes();
@@ -38,7 +38,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   boolean hasClientStatsReportInterval();
   /**
@@ -48,7 +48,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   com.google.protobuf.Duration getClientStatsReportInterval();
   /**
@@ -58,7 +58,7 @@ public interface InitialLoadBalanceResponseOrBuilder extends
    * positive.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration client_stats_report_interval = 2;</code>
+   * <code>.google.protobuf.Duration client_stats_report_interval = 2;</code>
    */
   com.google.protobuf.DurationOrBuilder getClientStatsReportIntervalOrBuilder();
 }

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java

@@ -137,7 +137,7 @@ public  final class LoadBalanceRequest extends
    * This message should be sent on the first request to the load balancer.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
   public io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest() {
     if (loadBalanceRequestTypeCase_ == 1) {
@@ -150,7 +150,7 @@ public  final class LoadBalanceRequest extends
    * This message should be sent on the first request to the load balancer.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
   public io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder getInitialRequestOrBuilder() {
     if (loadBalanceRequestTypeCase_ == 1) {
@@ -166,7 +166,7 @@ public  final class LoadBalanceRequest extends
    * based on the duration defined in the InitialLoadBalanceResponse.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
   public io.grpc.grpclb.ClientStats getClientStats() {
     if (loadBalanceRequestTypeCase_ == 2) {
@@ -180,7 +180,7 @@ public  final class LoadBalanceRequest extends
    * based on the duration defined in the InitialLoadBalanceResponse.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
   public io.grpc.grpclb.ClientStatsOrBuilder getClientStatsOrBuilder() {
     if (loadBalanceRequestTypeCase_ == 2) {
@@ -262,7 +262,7 @@ public  final class LoadBalanceRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     switch (loadBalanceRequestTypeCase_) {
       case 1:
         hash = (37 * hash) + INITIAL_REQUEST_FIELD_NUMBER;
@@ -534,7 +534,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest() {
       if (initialRequestBuilder_ == null) {
@@ -554,7 +554,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public Builder setInitialRequest(io.grpc.grpclb.InitialLoadBalanceRequest value) {
       if (initialRequestBuilder_ == null) {
@@ -574,7 +574,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public Builder setInitialRequest(
         io.grpc.grpclb.InitialLoadBalanceRequest.Builder builderForValue) {
@@ -592,7 +592,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public Builder mergeInitialRequest(io.grpc.grpclb.InitialLoadBalanceRequest value) {
       if (initialRequestBuilder_ == null) {
@@ -618,7 +618,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public Builder clearInitialRequest() {
       if (initialRequestBuilder_ == null) {
@@ -641,7 +641,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceRequest.Builder getInitialRequestBuilder() {
       return getInitialRequestFieldBuilder().getBuilder();
@@ -651,7 +651,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder getInitialRequestOrBuilder() {
       if ((loadBalanceRequestTypeCase_ == 1) && (initialRequestBuilder_ != null)) {
@@ -668,7 +668,7 @@ public  final class LoadBalanceRequest extends
      * This message should be sent on the first request to the load balancer.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.InitialLoadBalanceRequest, io.grpc.grpclb.InitialLoadBalanceRequest.Builder, io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder> 
@@ -697,7 +697,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public io.grpc.grpclb.ClientStats getClientStats() {
       if (clientStatsBuilder_ == null) {
@@ -718,7 +718,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public Builder setClientStats(io.grpc.grpclb.ClientStats value) {
       if (clientStatsBuilder_ == null) {
@@ -739,7 +739,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public Builder setClientStats(
         io.grpc.grpclb.ClientStats.Builder builderForValue) {
@@ -758,7 +758,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public Builder mergeClientStats(io.grpc.grpclb.ClientStats value) {
       if (clientStatsBuilder_ == null) {
@@ -785,7 +785,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public Builder clearClientStats() {
       if (clientStatsBuilder_ == null) {
@@ -809,7 +809,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public io.grpc.grpclb.ClientStats.Builder getClientStatsBuilder() {
       return getClientStatsFieldBuilder().getBuilder();
@@ -820,7 +820,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     public io.grpc.grpclb.ClientStatsOrBuilder getClientStatsOrBuilder() {
       if ((loadBalanceRequestTypeCase_ == 2) && (clientStatsBuilder_ != null)) {
@@ -838,7 +838,7 @@ public  final class LoadBalanceRequest extends
      * based on the duration defined in the InitialLoadBalanceResponse.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.ClientStats, io.grpc.grpclb.ClientStats.Builder, io.grpc.grpclb.ClientStatsOrBuilder> 

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java

@@ -12,7 +12,7 @@ public interface LoadBalanceRequestOrBuilder extends
    * This message should be sent on the first request to the load balancer.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
   io.grpc.grpclb.InitialLoadBalanceRequest getInitialRequest();
   /**
@@ -20,7 +20,7 @@ public interface LoadBalanceRequestOrBuilder extends
    * This message should be sent on the first request to the load balancer.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
    */
   io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder getInitialRequestOrBuilder();
 
@@ -30,7 +30,7 @@ public interface LoadBalanceRequestOrBuilder extends
    * based on the duration defined in the InitialLoadBalanceResponse.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
   io.grpc.grpclb.ClientStats getClientStats();
   /**
@@ -39,7 +39,7 @@ public interface LoadBalanceRequestOrBuilder extends
    * based on the duration defined in the InitialLoadBalanceResponse.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ClientStats client_stats = 2;</code>
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
    */
   io.grpc.grpclb.ClientStatsOrBuilder getClientStatsOrBuilder();
 

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java

@@ -137,7 +137,7 @@ public  final class LoadBalanceResponse extends
    * This message should be sent on the first response to the client.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
   public io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse() {
     if (loadBalanceResponseTypeCase_ == 1) {
@@ -150,7 +150,7 @@ public  final class LoadBalanceResponse extends
    * This message should be sent on the first response to the client.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
   public io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder getInitialResponseOrBuilder() {
     if (loadBalanceResponseTypeCase_ == 1) {
@@ -166,7 +166,7 @@ public  final class LoadBalanceResponse extends
    * should send requests to these servers in the specified order.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
   public io.grpc.grpclb.ServerList getServerList() {
     if (loadBalanceResponseTypeCase_ == 2) {
@@ -180,7 +180,7 @@ public  final class LoadBalanceResponse extends
    * should send requests to these servers in the specified order.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
   public io.grpc.grpclb.ServerListOrBuilder getServerListOrBuilder() {
     if (loadBalanceResponseTypeCase_ == 2) {
@@ -262,7 +262,7 @@ public  final class LoadBalanceResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     switch (loadBalanceResponseTypeCase_) {
       case 1:
         hash = (37 * hash) + INITIAL_RESPONSE_FIELD_NUMBER;
@@ -534,7 +534,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse() {
       if (initialResponseBuilder_ == null) {
@@ -554,7 +554,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public Builder setInitialResponse(io.grpc.grpclb.InitialLoadBalanceResponse value) {
       if (initialResponseBuilder_ == null) {
@@ -574,7 +574,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public Builder setInitialResponse(
         io.grpc.grpclb.InitialLoadBalanceResponse.Builder builderForValue) {
@@ -592,7 +592,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public Builder mergeInitialResponse(io.grpc.grpclb.InitialLoadBalanceResponse value) {
       if (initialResponseBuilder_ == null) {
@@ -618,7 +618,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public Builder clearInitialResponse() {
       if (initialResponseBuilder_ == null) {
@@ -641,7 +641,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceResponse.Builder getInitialResponseBuilder() {
       return getInitialResponseFieldBuilder().getBuilder();
@@ -651,7 +651,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     public io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder getInitialResponseOrBuilder() {
       if ((loadBalanceResponseTypeCase_ == 1) && (initialResponseBuilder_ != null)) {
@@ -668,7 +668,7 @@ public  final class LoadBalanceResponse extends
      * This message should be sent on the first response to the client.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.InitialLoadBalanceResponse, io.grpc.grpclb.InitialLoadBalanceResponse.Builder, io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder> 
@@ -697,7 +697,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public io.grpc.grpclb.ServerList getServerList() {
       if (serverListBuilder_ == null) {
@@ -718,7 +718,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public Builder setServerList(io.grpc.grpclb.ServerList value) {
       if (serverListBuilder_ == null) {
@@ -739,7 +739,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public Builder setServerList(
         io.grpc.grpclb.ServerList.Builder builderForValue) {
@@ -758,7 +758,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public Builder mergeServerList(io.grpc.grpclb.ServerList value) {
       if (serverListBuilder_ == null) {
@@ -785,7 +785,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public Builder clearServerList() {
       if (serverListBuilder_ == null) {
@@ -809,7 +809,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public io.grpc.grpclb.ServerList.Builder getServerListBuilder() {
       return getServerListFieldBuilder().getBuilder();
@@ -820,7 +820,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     public io.grpc.grpclb.ServerListOrBuilder getServerListOrBuilder() {
       if ((loadBalanceResponseTypeCase_ == 2) && (serverListBuilder_ != null)) {
@@ -838,7 +838,7 @@ public  final class LoadBalanceResponse extends
      * should send requests to these servers in the specified order.
      * </pre>
      *
-     * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.ServerList, io.grpc.grpclb.ServerList.Builder, io.grpc.grpclb.ServerListOrBuilder> 

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java

@@ -12,7 +12,7 @@ public interface LoadBalanceResponseOrBuilder extends
    * This message should be sent on the first response to the client.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
   io.grpc.grpclb.InitialLoadBalanceResponse getInitialResponse();
   /**
@@ -20,7 +20,7 @@ public interface LoadBalanceResponseOrBuilder extends
    * This message should be sent on the first response to the client.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
    */
   io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder getInitialResponseOrBuilder();
 
@@ -30,7 +30,7 @@ public interface LoadBalanceResponseOrBuilder extends
    * should send requests to these servers in the specified order.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
   io.grpc.grpclb.ServerList getServerList();
   /**
@@ -39,7 +39,7 @@ public interface LoadBalanceResponseOrBuilder extends
    * should send requests to these servers in the specified order.
    * </pre>
    *
-   * <code>optional .grpc.lb.v1.ServerList server_list = 2;</code>
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
    */
   io.grpc.grpclb.ServerListOrBuilder getServerListOrBuilder();
 

grpclb/src/generated/main/java/io/grpc/grpclb/Server.java

@@ -98,7 +98,7 @@ public  final class Server extends
    * either be an IPv4 or IPv6 address.
    * </pre>
    *
-   * <code>optional bytes ip_address = 1;</code>
+   * <code>bytes ip_address = 1;</code>
    */
   public com.google.protobuf.ByteString getIpAddress() {
     return ipAddress_;
@@ -111,7 +111,7 @@ public  final class Server extends
    * A resolved port number for the server.
    * </pre>
    *
-   * <code>optional int32 port = 2;</code>
+   * <code>int32 port = 2;</code>
    */
   public int getPort() {
     return port_;
@@ -127,7 +127,7 @@ public  final class Server extends
    * allow the backend to report load to the gRPC LB system.
    * </pre>
    *
-   * <code>optional string load_balance_token = 3;</code>
+   * <code>string load_balance_token = 3;</code>
    */
   public java.lang.String getLoadBalanceToken() {
     java.lang.Object ref = loadBalanceToken_;
@@ -149,7 +149,7 @@ public  final class Server extends
    * allow the backend to report load to the gRPC LB system.
    * </pre>
    *
-   * <code>optional string load_balance_token = 3;</code>
+   * <code>string load_balance_token = 3;</code>
    */
   public com.google.protobuf.ByteString
       getLoadBalanceTokenBytes() {
@@ -173,7 +173,7 @@ public  final class Server extends
    * when this server is chosen from the list.
    * </pre>
    *
-   * <code>optional bool drop_request = 4;</code>
+   * <code>bool drop_request = 4;</code>
    */
   public boolean getDropRequest() {
     return dropRequest_;
@@ -258,7 +258,7 @@ public  final class Server extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER;
     hash = (53 * hash) + getIpAddress().hashCode();
     hash = (37 * hash) + PORT_FIELD_NUMBER;
@@ -507,7 +507,7 @@ public  final class Server extends
      * either be an IPv4 or IPv6 address.
      * </pre>
      *
-     * <code>optional bytes ip_address = 1;</code>
+     * <code>bytes ip_address = 1;</code>
      */
     public com.google.protobuf.ByteString getIpAddress() {
       return ipAddress_;
@@ -518,7 +518,7 @@ public  final class Server extends
      * either be an IPv4 or IPv6 address.
      * </pre>
      *
-     * <code>optional bytes ip_address = 1;</code>
+     * <code>bytes ip_address = 1;</code>
      */
     public Builder setIpAddress(com.google.protobuf.ByteString value) {
       if (value == null) {
@@ -535,7 +535,7 @@ public  final class Server extends
      * either be an IPv4 or IPv6 address.
      * </pre>
      *
-     * <code>optional bytes ip_address = 1;</code>
+     * <code>bytes ip_address = 1;</code>
      */
     public Builder clearIpAddress() {
       
@@ -550,7 +550,7 @@ public  final class Server extends
      * A resolved port number for the server.
      * </pre>
      *
-     * <code>optional int32 port = 2;</code>
+     * <code>int32 port = 2;</code>
      */
     public int getPort() {
       return port_;
@@ -560,7 +560,7 @@ public  final class Server extends
      * A resolved port number for the server.
      * </pre>
      *
-     * <code>optional int32 port = 2;</code>
+     * <code>int32 port = 2;</code>
      */
     public Builder setPort(int value) {
       
@@ -573,7 +573,7 @@ public  final class Server extends
      * A resolved port number for the server.
      * </pre>
      *
-     * <code>optional int32 port = 2;</code>
+     * <code>int32 port = 2;</code>
      */
     public Builder clearPort() {
       
@@ -591,7 +591,7 @@ public  final class Server extends
      * allow the backend to report load to the gRPC LB system.
      * </pre>
      *
-     * <code>optional string load_balance_token = 3;</code>
+     * <code>string load_balance_token = 3;</code>
      */
     public java.lang.String getLoadBalanceToken() {
       java.lang.Object ref = loadBalanceToken_;
@@ -613,7 +613,7 @@ public  final class Server extends
      * allow the backend to report load to the gRPC LB system.
      * </pre>
      *
-     * <code>optional string load_balance_token = 3;</code>
+     * <code>string load_balance_token = 3;</code>
      */
     public com.google.protobuf.ByteString
         getLoadBalanceTokenBytes() {
@@ -636,7 +636,7 @@ public  final class Server extends
      * allow the backend to report load to the gRPC LB system.
      * </pre>
      *
-     * <code>optional string load_balance_token = 3;</code>
+     * <code>string load_balance_token = 3;</code>
      */
     public Builder setLoadBalanceToken(
         java.lang.String value) {
@@ -656,7 +656,7 @@ public  final class Server extends
      * allow the backend to report load to the gRPC LB system.
      * </pre>
      *
-     * <code>optional string load_balance_token = 3;</code>
+     * <code>string load_balance_token = 3;</code>
      */
     public Builder clearLoadBalanceToken() {
       
@@ -672,7 +672,7 @@ public  final class Server extends
      * allow the backend to report load to the gRPC LB system.
      * </pre>
      *
-     * <code>optional string load_balance_token = 3;</code>
+     * <code>string load_balance_token = 3;</code>
      */
     public Builder setLoadBalanceTokenBytes(
         com.google.protobuf.ByteString value) {
@@ -693,7 +693,7 @@ public  final class Server extends
      * when this server is chosen from the list.
      * </pre>
      *
-     * <code>optional bool drop_request = 4;</code>
+     * <code>bool drop_request = 4;</code>
      */
     public boolean getDropRequest() {
       return dropRequest_;
@@ -704,7 +704,7 @@ public  final class Server extends
      * when this server is chosen from the list.
      * </pre>
      *
-     * <code>optional bool drop_request = 4;</code>
+     * <code>bool drop_request = 4;</code>
      */
     public Builder setDropRequest(boolean value) {
       
@@ -718,7 +718,7 @@ public  final class Server extends
      * when this server is chosen from the list.
      * </pre>
      *
-     * <code>optional bool drop_request = 4;</code>
+     * <code>bool drop_request = 4;</code>
      */
     public Builder clearDropRequest() {
       

grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java

@@ -172,7 +172,7 @@ public  final class ServerList extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   public boolean hasExpirationInterval() {
     return expirationInterval_ != null;
@@ -185,7 +185,7 @@ public  final class ServerList extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   public com.google.protobuf.Duration getExpirationInterval() {
     return expirationInterval_ == null ? com.google.protobuf.Duration.getDefaultInstance() : expirationInterval_;
@@ -198,7 +198,7 @@ public  final class ServerList extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   public com.google.protobuf.DurationOrBuilder getExpirationIntervalOrBuilder() {
     return getExpirationInterval();
@@ -269,7 +269,7 @@ public  final class ServerList extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (getServersCount() > 0) {
       hash = (37 * hash) + SERVERS_FIELD_NUMBER;
       hash = (53 * hash) + getServersList().hashCode();
@@ -922,7 +922,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public boolean hasExpirationInterval() {
       return expirationIntervalBuilder_ != null || expirationInterval_ != null;
@@ -935,7 +935,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public com.google.protobuf.Duration getExpirationInterval() {
       if (expirationIntervalBuilder_ == null) {
@@ -952,7 +952,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public Builder setExpirationInterval(com.google.protobuf.Duration value) {
       if (expirationIntervalBuilder_ == null) {
@@ -975,7 +975,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public Builder setExpirationInterval(
         com.google.protobuf.Duration.Builder builderForValue) {
@@ -996,7 +996,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public Builder mergeExpirationInterval(com.google.protobuf.Duration value) {
       if (expirationIntervalBuilder_ == null) {
@@ -1021,7 +1021,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public Builder clearExpirationInterval() {
       if (expirationIntervalBuilder_ == null) {
@@ -1042,7 +1042,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public com.google.protobuf.Duration.Builder getExpirationIntervalBuilder() {
       
@@ -1057,7 +1057,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     public com.google.protobuf.DurationOrBuilder getExpirationIntervalOrBuilder() {
       if (expirationIntervalBuilder_ != null) {
@@ -1075,7 +1075,7 @@ public  final class ServerList extends
      * client can assume the list is valid until the next list is received.
      * </pre>
      *
-     * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+     * <code>.google.protobuf.Duration expiration_interval = 3;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 

grpclb/src/generated/main/java/io/grpc/grpclb/ServerListOrBuilder.java

@@ -74,7 +74,7 @@ public interface ServerListOrBuilder extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   boolean hasExpirationInterval();
   /**
@@ -85,7 +85,7 @@ public interface ServerListOrBuilder extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   com.google.protobuf.Duration getExpirationInterval();
   /**
@@ -96,7 +96,7 @@ public interface ServerListOrBuilder extends
    * client can assume the list is valid until the next list is received.
    * </pre>
    *
-   * <code>optional .google.protobuf.Duration expiration_interval = 3;</code>
+   * <code>.google.protobuf.Duration expiration_interval = 3;</code>
    */
   com.google.protobuf.DurationOrBuilder getExpirationIntervalOrBuilder();
 }

grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java

@@ -13,7 +13,7 @@ public interface ServerOrBuilder extends
    * either be an IPv4 or IPv6 address.
    * </pre>
    *
-   * <code>optional bytes ip_address = 1;</code>
+   * <code>bytes ip_address = 1;</code>
    */
   com.google.protobuf.ByteString getIpAddress();
 
@@ -22,7 +22,7 @@ public interface ServerOrBuilder extends
    * A resolved port number for the server.
    * </pre>
    *
-   * <code>optional int32 port = 2;</code>
+   * <code>int32 port = 2;</code>
    */
   int getPort();
 
@@ -34,7 +34,7 @@ public interface ServerOrBuilder extends
    * allow the backend to report load to the gRPC LB system.
    * </pre>
    *
-   * <code>optional string load_balance_token = 3;</code>
+   * <code>string load_balance_token = 3;</code>
    */
   java.lang.String getLoadBalanceToken();
   /**
@@ -45,7 +45,7 @@ public interface ServerOrBuilder extends
    * allow the backend to report load to the gRPC LB system.
    * </pre>
    *
-   * <code>optional string load_balance_token = 3;</code>
+   * <code>string load_balance_token = 3;</code>
    */
   com.google.protobuf.ByteString
       getLoadBalanceTokenBytes();
@@ -56,7 +56,7 @@ public interface ServerOrBuilder extends
    * when this server is chosen from the list.
    * </pre>
    *
-   * <code>optional bool drop_request = 4;</code>
+   * <code>bool drop_request = 4;</code>
    */
   boolean getDropRequest();
 }

protobuf-nano/src/generated/test/javanano/io/grpc/protobuf/nano/Messages.java

@@ -22,16 +22,16 @@ public interface Messages {
       return _emptyArray;
     }
 
-    // optional int32 i = 1;
+    // int32 i = 1;
     public int i;
 
-    // optional bool b = 2;
+    // bool b = 2;
     public boolean b;
 
-    // optional string s = 3;
+    // string s = 3;
     public java.lang.String s;
 
-    // optional bytes bs = 4;
+    // bytes bs = 4;
     public byte[] bs;
 
     public Message() {

services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java

@@ -75,7 +75,7 @@ public  final class HealthCheckRequest extends
   public static final int SERVICE_FIELD_NUMBER = 1;
   private volatile java.lang.Object service_;
   /**
-   * <code>optional string service = 1;</code>
+   * <code>string service = 1;</code>
    */
   public java.lang.String getService() {
     java.lang.Object ref = service_;
@@ -90,7 +90,7 @@ public  final class HealthCheckRequest extends
     }
   }
   /**
-   * <code>optional string service = 1;</code>
+   * <code>string service = 1;</code>
    */
   public com.google.protobuf.ByteString
       getServiceBytes() {
@@ -158,7 +158,7 @@ public  final class HealthCheckRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + SERVICE_FIELD_NUMBER;
     hash = (53 * hash) + getService().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -377,7 +377,7 @@ public  final class HealthCheckRequest extends
 
     private java.lang.Object service_ = "";
     /**
-     * <code>optional string service = 1;</code>
+     * <code>string service = 1;</code>
      */
     public java.lang.String getService() {
       java.lang.Object ref = service_;
@@ -392,7 +392,7 @@ public  final class HealthCheckRequest extends
       }
     }
     /**
-     * <code>optional string service = 1;</code>
+     * <code>string service = 1;</code>
      */
     public com.google.protobuf.ByteString
         getServiceBytes() {
@@ -408,7 +408,7 @@ public  final class HealthCheckRequest extends
       }
     }
     /**
-     * <code>optional string service = 1;</code>
+     * <code>string service = 1;</code>
      */
     public Builder setService(
         java.lang.String value) {
@@ -421,7 +421,7 @@ public  final class HealthCheckRequest extends
       return this;
     }
     /**
-     * <code>optional string service = 1;</code>
+     * <code>string service = 1;</code>
      */
     public Builder clearService() {
       
@@ -430,7 +430,7 @@ public  final class HealthCheckRequest extends
       return this;
     }
     /**
-     * <code>optional string service = 1;</code>
+     * <code>string service = 1;</code>
      */
     public Builder setServiceBytes(
         com.google.protobuf.ByteString value) {

services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequestOrBuilder.java

@@ -8,11 +8,11 @@ public interface HealthCheckRequestOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>optional string service = 1;</code>
+   * <code>string service = 1;</code>
    */
   java.lang.String getService();
   /**
-   * <code>optional string service = 1;</code>
+   * <code>string service = 1;</code>
    */
   com.google.protobuf.ByteString
       getServiceBytes();

services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java

@@ -182,13 +182,13 @@ public  final class HealthCheckResponse extends
   public static final int STATUS_FIELD_NUMBER = 1;
   private int status_;
   /**
-   * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+   * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
    */
   public int getStatusValue() {
     return status_;
   }
   /**
-   * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+   * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
    */
   public io.grpc.health.v1.HealthCheckResponse.ServingStatus getStatus() {
     io.grpc.health.v1.HealthCheckResponse.ServingStatus result = io.grpc.health.v1.HealthCheckResponse.ServingStatus.valueOf(status_);
@@ -247,7 +247,7 @@ public  final class HealthCheckResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + STATUS_FIELD_NUMBER;
     hash = (53 * hash) + status_;
     hash = (29 * hash) + unknownFields.hashCode();
@@ -465,13 +465,13 @@ public  final class HealthCheckResponse extends
 
     private int status_ = 0;
     /**
-     * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+     * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
      */
     public int getStatusValue() {
       return status_;
     }
     /**
-     * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+     * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
      */
     public Builder setStatusValue(int value) {
       status_ = value;
@@ -479,14 +479,14 @@ public  final class HealthCheckResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+     * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
      */
     public io.grpc.health.v1.HealthCheckResponse.ServingStatus getStatus() {
       io.grpc.health.v1.HealthCheckResponse.ServingStatus result = io.grpc.health.v1.HealthCheckResponse.ServingStatus.valueOf(status_);
       return result == null ? io.grpc.health.v1.HealthCheckResponse.ServingStatus.UNRECOGNIZED : result;
     }
     /**
-     * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+     * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
      */
     public Builder setStatus(io.grpc.health.v1.HealthCheckResponse.ServingStatus value) {
       if (value == null) {
@@ -498,7 +498,7 @@ public  final class HealthCheckResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+     * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
      */
     public Builder clearStatus() {
       

services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponseOrBuilder.java

@@ -8,11 +8,11 @@ public interface HealthCheckResponseOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+   * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
    */
   int getStatusValue();
   /**
-   * <code>optional .grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
+   * <code>.grpc.health.v1.HealthCheckResponse.ServingStatus status = 1;</code>
    */
   io.grpc.health.v1.HealthCheckResponse.ServingStatus getStatus();
 }

services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java

@@ -89,7 +89,7 @@ public  final class ErrorResponse extends
    * This field uses the error codes defined in grpc::StatusCode.
    * </pre>
    *
-   * <code>optional int32 error_code = 1;</code>
+   * <code>int32 error_code = 1;</code>
    */
   public int getErrorCode() {
     return errorCode_;
@@ -98,7 +98,7 @@ public  final class ErrorResponse extends
   public static final int ERROR_MESSAGE_FIELD_NUMBER = 2;
   private volatile java.lang.Object errorMessage_;
   /**
-   * <code>optional string error_message = 2;</code>
+   * <code>string error_message = 2;</code>
    */
   public java.lang.String getErrorMessage() {
     java.lang.Object ref = errorMessage_;
@@ -113,7 +113,7 @@ public  final class ErrorResponse extends
     }
   }
   /**
-   * <code>optional string error_message = 2;</code>
+   * <code>string error_message = 2;</code>
    */
   public com.google.protobuf.ByteString
       getErrorMessageBytes() {
@@ -190,7 +190,7 @@ public  final class ErrorResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + ERROR_CODE_FIELD_NUMBER;
     hash = (53 * hash) + getErrorCode();
     hash = (37 * hash) + ERROR_MESSAGE_FIELD_NUMBER;
@@ -425,7 +425,7 @@ public  final class ErrorResponse extends
      * This field uses the error codes defined in grpc::StatusCode.
      * </pre>
      *
-     * <code>optional int32 error_code = 1;</code>
+     * <code>int32 error_code = 1;</code>
      */
     public int getErrorCode() {
       return errorCode_;
@@ -435,7 +435,7 @@ public  final class ErrorResponse extends
      * This field uses the error codes defined in grpc::StatusCode.
      * </pre>
      *
-     * <code>optional int32 error_code = 1;</code>
+     * <code>int32 error_code = 1;</code>
      */
     public Builder setErrorCode(int value) {
       
@@ -448,7 +448,7 @@ public  final class ErrorResponse extends
      * This field uses the error codes defined in grpc::StatusCode.
      * </pre>
      *
-     * <code>optional int32 error_code = 1;</code>
+     * <code>int32 error_code = 1;</code>
      */
     public Builder clearErrorCode() {
       
@@ -459,7 +459,7 @@ public  final class ErrorResponse extends
 
     private java.lang.Object errorMessage_ = "";
     /**
-     * <code>optional string error_message = 2;</code>
+     * <code>string error_message = 2;</code>
      */
     public java.lang.String getErrorMessage() {
       java.lang.Object ref = errorMessage_;
@@ -474,7 +474,7 @@ public  final class ErrorResponse extends
       }
     }
     /**
-     * <code>optional string error_message = 2;</code>
+     * <code>string error_message = 2;</code>
      */
     public com.google.protobuf.ByteString
         getErrorMessageBytes() {
@@ -490,7 +490,7 @@ public  final class ErrorResponse extends
       }
     }
     /**
-     * <code>optional string error_message = 2;</code>
+     * <code>string error_message = 2;</code>
      */
     public Builder setErrorMessage(
         java.lang.String value) {
@@ -503,7 +503,7 @@ public  final class ErrorResponse extends
       return this;
     }
     /**
-     * <code>optional string error_message = 2;</code>
+     * <code>string error_message = 2;</code>
      */
     public Builder clearErrorMessage() {
       
@@ -512,7 +512,7 @@ public  final class ErrorResponse extends
       return this;
     }
     /**
-     * <code>optional string error_message = 2;</code>
+     * <code>string error_message = 2;</code>
      */
     public Builder setErrorMessageBytes(
         com.google.protobuf.ByteString value) {

services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponseOrBuilder.java

@@ -12,16 +12,16 @@ public interface ErrorResponseOrBuilder extends
    * This field uses the error codes defined in grpc::StatusCode.
    * </pre>
    *
-   * <code>optional int32 error_code = 1;</code>
+   * <code>int32 error_code = 1;</code>
    */
   int getErrorCode();
 
   /**
-   * <code>optional string error_message = 2;</code>
+   * <code>string error_message = 2;</code>
    */
   java.lang.String getErrorMessage();
   /**
-   * <code>optional string error_message = 2;</code>
+   * <code>string error_message = 2;</code>
    */
   com.google.protobuf.ByteString
       getErrorMessageBytes();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java

@@ -111,7 +111,7 @@ public  final class ExtensionNumberResponse extends
    * is <package>.<type>
    * </pre>
    *
-   * <code>optional string base_type_name = 1;</code>
+   * <code>string base_type_name = 1;</code>
    */
   public java.lang.String getBaseTypeName() {
     java.lang.Object ref = baseTypeName_;
@@ -131,7 +131,7 @@ public  final class ExtensionNumberResponse extends
    * is &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string base_type_name = 1;</code>
+   * <code>string base_type_name = 1;</code>
    */
   public com.google.protobuf.ByteString
       getBaseTypeNameBytes() {
@@ -246,7 +246,7 @@ public  final class ExtensionNumberResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + BASE_TYPE_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getBaseTypeName().hashCode();
     if (getExtensionNumberCount() > 0) {
@@ -500,7 +500,7 @@ public  final class ExtensionNumberResponse extends
      * is &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string base_type_name = 1;</code>
+     * <code>string base_type_name = 1;</code>
      */
     public java.lang.String getBaseTypeName() {
       java.lang.Object ref = baseTypeName_;
@@ -520,7 +520,7 @@ public  final class ExtensionNumberResponse extends
      * is &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string base_type_name = 1;</code>
+     * <code>string base_type_name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getBaseTypeNameBytes() {
@@ -541,7 +541,7 @@ public  final class ExtensionNumberResponse extends
      * is &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string base_type_name = 1;</code>
+     * <code>string base_type_name = 1;</code>
      */
     public Builder setBaseTypeName(
         java.lang.String value) {
@@ -559,7 +559,7 @@ public  final class ExtensionNumberResponse extends
      * is &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string base_type_name = 1;</code>
+     * <code>string base_type_name = 1;</code>
      */
     public Builder clearBaseTypeName() {
       
@@ -573,7 +573,7 @@ public  final class ExtensionNumberResponse extends
      * is &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string base_type_name = 1;</code>
+     * <code>string base_type_name = 1;</code>
      */
     public Builder setBaseTypeNameBytes(
         com.google.protobuf.ByteString value) {

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponseOrBuilder.java

@@ -13,7 +13,7 @@ public interface ExtensionNumberResponseOrBuilder extends
    * is <package>.<type>
    * </pre>
    *
-   * <code>optional string base_type_name = 1;</code>
+   * <code>string base_type_name = 1;</code>
    */
   java.lang.String getBaseTypeName();
   /**
@@ -22,7 +22,7 @@ public interface ExtensionNumberResponseOrBuilder extends
    * is &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string base_type_name = 1;</code>
+   * <code>string base_type_name = 1;</code>
    */
   com.google.protobuf.ByteString
       getBaseTypeNameBytes();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java

@@ -90,7 +90,7 @@ public  final class ExtensionRequest extends
    * Fully-qualified type name. The format should be <package>.<type>
    * </pre>
    *
-   * <code>optional string containing_type = 1;</code>
+   * <code>string containing_type = 1;</code>
    */
   public java.lang.String getContainingType() {
     java.lang.Object ref = containingType_;
@@ -109,7 +109,7 @@ public  final class ExtensionRequest extends
    * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string containing_type = 1;</code>
+   * <code>string containing_type = 1;</code>
    */
   public com.google.protobuf.ByteString
       getContainingTypeBytes() {
@@ -128,7 +128,7 @@ public  final class ExtensionRequest extends
   public static final int EXTENSION_NUMBER_FIELD_NUMBER = 2;
   private int extensionNumber_;
   /**
-   * <code>optional int32 extension_number = 2;</code>
+   * <code>int32 extension_number = 2;</code>
    */
   public int getExtensionNumber() {
     return extensionNumber_;
@@ -195,7 +195,7 @@ public  final class ExtensionRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CONTAINING_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + getContainingType().hashCode();
     hash = (37 * hash) + EXTENSION_NUMBER_FIELD_NUMBER;
@@ -431,7 +431,7 @@ public  final class ExtensionRequest extends
      * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string containing_type = 1;</code>
+     * <code>string containing_type = 1;</code>
      */
     public java.lang.String getContainingType() {
       java.lang.Object ref = containingType_;
@@ -450,7 +450,7 @@ public  final class ExtensionRequest extends
      * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string containing_type = 1;</code>
+     * <code>string containing_type = 1;</code>
      */
     public com.google.protobuf.ByteString
         getContainingTypeBytes() {
@@ -470,7 +470,7 @@ public  final class ExtensionRequest extends
      * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string containing_type = 1;</code>
+     * <code>string containing_type = 1;</code>
      */
     public Builder setContainingType(
         java.lang.String value) {
@@ -487,7 +487,7 @@ public  final class ExtensionRequest extends
      * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string containing_type = 1;</code>
+     * <code>string containing_type = 1;</code>
      */
     public Builder clearContainingType() {
       
@@ -500,7 +500,7 @@ public  final class ExtensionRequest extends
      * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string containing_type = 1;</code>
+     * <code>string containing_type = 1;</code>
      */
     public Builder setContainingTypeBytes(
         com.google.protobuf.ByteString value) {
@@ -516,13 +516,13 @@ public  final class ExtensionRequest extends
 
     private int extensionNumber_ ;
     /**
-     * <code>optional int32 extension_number = 2;</code>
+     * <code>int32 extension_number = 2;</code>
      */
     public int getExtensionNumber() {
       return extensionNumber_;
     }
     /**
-     * <code>optional int32 extension_number = 2;</code>
+     * <code>int32 extension_number = 2;</code>
      */
     public Builder setExtensionNumber(int value) {
       
@@ -531,7 +531,7 @@ public  final class ExtensionRequest extends
       return this;
     }
     /**
-     * <code>optional int32 extension_number = 2;</code>
+     * <code>int32 extension_number = 2;</code>
      */
     public Builder clearExtensionNumber() {
       

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequestOrBuilder.java

@@ -12,7 +12,7 @@ public interface ExtensionRequestOrBuilder extends
    * Fully-qualified type name. The format should be <package>.<type>
    * </pre>
    *
-   * <code>optional string containing_type = 1;</code>
+   * <code>string containing_type = 1;</code>
    */
   java.lang.String getContainingType();
   /**
@@ -20,13 +20,13 @@ public interface ExtensionRequestOrBuilder extends
    * Fully-qualified type name. The format should be &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string containing_type = 1;</code>
+   * <code>string containing_type = 1;</code>
    */
   com.google.protobuf.ByteString
       getContainingTypeBytes();
 
   /**
-   * <code>optional int32 extension_number = 2;</code>
+   * <code>int32 extension_number = 2;</code>
    */
   int getExtensionNumber();
 }

services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java

@@ -181,7 +181,7 @@ public  final class FileDescriptorResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (getFileDescriptorProtoCount() > 0) {
       hash = (37 * hash) + FILE_DESCRIPTOR_PROTO_FIELD_NUMBER;
       hash = (53 * hash) + getFileDescriptorProtoList().hashCode();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java

@@ -195,7 +195,7 @@ public  final class ListServiceResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (getServiceCount() > 0) {
       hash = (37 * hash) + SERVICE_FIELD_NUMBER;
       hash = (53 * hash) + getServiceList().hashCode();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java

@@ -161,7 +161,7 @@ public  final class ServerReflectionRequest extends
   public static final int HOST_FIELD_NUMBER = 1;
   private volatile java.lang.Object host_;
   /**
-   * <code>optional string host = 1;</code>
+   * <code>string host = 1;</code>
    */
   public java.lang.String getHost() {
     java.lang.Object ref = host_;
@@ -176,7 +176,7 @@ public  final class ServerReflectionRequest extends
     }
   }
   /**
-   * <code>optional string host = 1;</code>
+   * <code>string host = 1;</code>
    */
   public com.google.protobuf.ByteString
       getHostBytes() {
@@ -198,7 +198,7 @@ public  final class ServerReflectionRequest extends
    * Find a proto file by the file name.
    * </pre>
    *
-   * <code>optional string file_by_filename = 3;</code>
+   * <code>string file_by_filename = 3;</code>
    */
   public java.lang.String getFileByFilename() {
     java.lang.Object ref = "";
@@ -222,7 +222,7 @@ public  final class ServerReflectionRequest extends
    * Find a proto file by the file name.
    * </pre>
    *
-   * <code>optional string file_by_filename = 3;</code>
+   * <code>string file_by_filename = 3;</code>
    */
   public com.google.protobuf.ByteString
       getFileByFilenameBytes() {
@@ -251,7 +251,7 @@ public  final class ServerReflectionRequest extends
    * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
    * </pre>
    *
-   * <code>optional string file_containing_symbol = 4;</code>
+   * <code>string file_containing_symbol = 4;</code>
    */
   public java.lang.String getFileContainingSymbol() {
     java.lang.Object ref = "";
@@ -277,7 +277,7 @@ public  final class ServerReflectionRequest extends
    * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
    * </pre>
    *
-   * <code>optional string file_containing_symbol = 4;</code>
+   * <code>string file_containing_symbol = 4;</code>
    */
   public com.google.protobuf.ByteString
       getFileContainingSymbolBytes() {
@@ -305,7 +305,7 @@ public  final class ServerReflectionRequest extends
    * message type with the given field number.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
   public io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension() {
     if (messageRequestCase_ == 5) {
@@ -319,7 +319,7 @@ public  final class ServerReflectionRequest extends
    * message type with the given field number.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
   public io.grpc.reflection.v1alpha.ExtensionRequestOrBuilder getFileContainingExtensionOrBuilder() {
     if (messageRequestCase_ == 5) {
@@ -341,7 +341,7 @@ public  final class ServerReflectionRequest extends
    * &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string all_extension_numbers_of_type = 6;</code>
+   * <code>string all_extension_numbers_of_type = 6;</code>
    */
   public java.lang.String getAllExtensionNumbersOfType() {
     java.lang.Object ref = "";
@@ -372,7 +372,7 @@ public  final class ServerReflectionRequest extends
    * &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string all_extension_numbers_of_type = 6;</code>
+   * <code>string all_extension_numbers_of_type = 6;</code>
    */
   public com.google.protobuf.ByteString
       getAllExtensionNumbersOfTypeBytes() {
@@ -400,7 +400,7 @@ public  final class ServerReflectionRequest extends
    * checked.
    * </pre>
    *
-   * <code>optional string list_services = 7;</code>
+   * <code>string list_services = 7;</code>
    */
   public java.lang.String getListServices() {
     java.lang.Object ref = "";
@@ -425,7 +425,7 @@ public  final class ServerReflectionRequest extends
    * checked.
    * </pre>
    *
-   * <code>optional string list_services = 7;</code>
+   * <code>string list_services = 7;</code>
    */
   public com.google.protobuf.ByteString
       getListServicesBytes() {
@@ -556,7 +556,7 @@ public  final class ServerReflectionRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + HOST_FIELD_NUMBER;
     hash = (53 * hash) + getHost().hashCode();
     switch (messageRequestCase_) {
@@ -873,7 +873,7 @@ public  final class ServerReflectionRequest extends
 
     private java.lang.Object host_ = "";
     /**
-     * <code>optional string host = 1;</code>
+     * <code>string host = 1;</code>
      */
     public java.lang.String getHost() {
       java.lang.Object ref = host_;
@@ -888,7 +888,7 @@ public  final class ServerReflectionRequest extends
       }
     }
     /**
-     * <code>optional string host = 1;</code>
+     * <code>string host = 1;</code>
      */
     public com.google.protobuf.ByteString
         getHostBytes() {
@@ -904,7 +904,7 @@ public  final class ServerReflectionRequest extends
       }
     }
     /**
-     * <code>optional string host = 1;</code>
+     * <code>string host = 1;</code>
      */
     public Builder setHost(
         java.lang.String value) {
@@ -917,7 +917,7 @@ public  final class ServerReflectionRequest extends
       return this;
     }
     /**
-     * <code>optional string host = 1;</code>
+     * <code>string host = 1;</code>
      */
     public Builder clearHost() {
       
@@ -926,7 +926,7 @@ public  final class ServerReflectionRequest extends
       return this;
     }
     /**
-     * <code>optional string host = 1;</code>
+     * <code>string host = 1;</code>
      */
     public Builder setHostBytes(
         com.google.protobuf.ByteString value) {
@@ -945,7 +945,7 @@ public  final class ServerReflectionRequest extends
      * Find a proto file by the file name.
      * </pre>
      *
-     * <code>optional string file_by_filename = 3;</code>
+     * <code>string file_by_filename = 3;</code>
      */
     public java.lang.String getFileByFilename() {
       java.lang.Object ref = "";
@@ -969,7 +969,7 @@ public  final class ServerReflectionRequest extends
      * Find a proto file by the file name.
      * </pre>
      *
-     * <code>optional string file_by_filename = 3;</code>
+     * <code>string file_by_filename = 3;</code>
      */
     public com.google.protobuf.ByteString
         getFileByFilenameBytes() {
@@ -994,7 +994,7 @@ public  final class ServerReflectionRequest extends
      * Find a proto file by the file name.
      * </pre>
      *
-     * <code>optional string file_by_filename = 3;</code>
+     * <code>string file_by_filename = 3;</code>
      */
     public Builder setFileByFilename(
         java.lang.String value) {
@@ -1011,7 +1011,7 @@ public  final class ServerReflectionRequest extends
      * Find a proto file by the file name.
      * </pre>
      *
-     * <code>optional string file_by_filename = 3;</code>
+     * <code>string file_by_filename = 3;</code>
      */
     public Builder clearFileByFilename() {
       if (messageRequestCase_ == 3) {
@@ -1026,7 +1026,7 @@ public  final class ServerReflectionRequest extends
      * Find a proto file by the file name.
      * </pre>
      *
-     * <code>optional string file_by_filename = 3;</code>
+     * <code>string file_by_filename = 3;</code>
      */
     public Builder setFileByFilenameBytes(
         com.google.protobuf.ByteString value) {
@@ -1047,7 +1047,7 @@ public  final class ServerReflectionRequest extends
      * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
      * </pre>
      *
-     * <code>optional string file_containing_symbol = 4;</code>
+     * <code>string file_containing_symbol = 4;</code>
      */
     public java.lang.String getFileContainingSymbol() {
       java.lang.Object ref = "";
@@ -1073,7 +1073,7 @@ public  final class ServerReflectionRequest extends
      * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
      * </pre>
      *
-     * <code>optional string file_containing_symbol = 4;</code>
+     * <code>string file_containing_symbol = 4;</code>
      */
     public com.google.protobuf.ByteString
         getFileContainingSymbolBytes() {
@@ -1100,7 +1100,7 @@ public  final class ServerReflectionRequest extends
      * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
      * </pre>
      *
-     * <code>optional string file_containing_symbol = 4;</code>
+     * <code>string file_containing_symbol = 4;</code>
      */
     public Builder setFileContainingSymbol(
         java.lang.String value) {
@@ -1119,7 +1119,7 @@ public  final class ServerReflectionRequest extends
      * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
      * </pre>
      *
-     * <code>optional string file_containing_symbol = 4;</code>
+     * <code>string file_containing_symbol = 4;</code>
      */
     public Builder clearFileContainingSymbol() {
       if (messageRequestCase_ == 4) {
@@ -1136,7 +1136,7 @@ public  final class ServerReflectionRequest extends
      * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
      * </pre>
      *
-     * <code>optional string file_containing_symbol = 4;</code>
+     * <code>string file_containing_symbol = 4;</code>
      */
     public Builder setFileContainingSymbolBytes(
         com.google.protobuf.ByteString value) {
@@ -1158,7 +1158,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension() {
       if (fileContainingExtensionBuilder_ == null) {
@@ -1179,7 +1179,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public Builder setFileContainingExtension(io.grpc.reflection.v1alpha.ExtensionRequest value) {
       if (fileContainingExtensionBuilder_ == null) {
@@ -1200,7 +1200,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public Builder setFileContainingExtension(
         io.grpc.reflection.v1alpha.ExtensionRequest.Builder builderForValue) {
@@ -1219,7 +1219,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public Builder mergeFileContainingExtension(io.grpc.reflection.v1alpha.ExtensionRequest value) {
       if (fileContainingExtensionBuilder_ == null) {
@@ -1246,7 +1246,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public Builder clearFileContainingExtension() {
       if (fileContainingExtensionBuilder_ == null) {
@@ -1270,7 +1270,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionRequest.Builder getFileContainingExtensionBuilder() {
       return getFileContainingExtensionFieldBuilder().getBuilder();
@@ -1281,7 +1281,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionRequestOrBuilder getFileContainingExtensionOrBuilder() {
       if ((messageRequestCase_ == 5) && (fileContainingExtensionBuilder_ != null)) {
@@ -1299,7 +1299,7 @@ public  final class ServerReflectionRequest extends
      * message type with the given field number.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ExtensionRequest, io.grpc.reflection.v1alpha.ExtensionRequest.Builder, io.grpc.reflection.v1alpha.ExtensionRequestOrBuilder> 
@@ -1332,7 +1332,7 @@ public  final class ServerReflectionRequest extends
      * &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string all_extension_numbers_of_type = 6;</code>
+     * <code>string all_extension_numbers_of_type = 6;</code>
      */
     public java.lang.String getAllExtensionNumbersOfType() {
       java.lang.Object ref = "";
@@ -1363,7 +1363,7 @@ public  final class ServerReflectionRequest extends
      * &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string all_extension_numbers_of_type = 6;</code>
+     * <code>string all_extension_numbers_of_type = 6;</code>
      */
     public com.google.protobuf.ByteString
         getAllExtensionNumbersOfTypeBytes() {
@@ -1395,7 +1395,7 @@ public  final class ServerReflectionRequest extends
      * &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string all_extension_numbers_of_type = 6;</code>
+     * <code>string all_extension_numbers_of_type = 6;</code>
      */
     public Builder setAllExtensionNumbersOfType(
         java.lang.String value) {
@@ -1419,7 +1419,7 @@ public  final class ServerReflectionRequest extends
      * &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string all_extension_numbers_of_type = 6;</code>
+     * <code>string all_extension_numbers_of_type = 6;</code>
      */
     public Builder clearAllExtensionNumbersOfType() {
       if (messageRequestCase_ == 6) {
@@ -1441,7 +1441,7 @@ public  final class ServerReflectionRequest extends
      * &lt;package&gt;.&lt;type&gt;
      * </pre>
      *
-     * <code>optional string all_extension_numbers_of_type = 6;</code>
+     * <code>string all_extension_numbers_of_type = 6;</code>
      */
     public Builder setAllExtensionNumbersOfTypeBytes(
         com.google.protobuf.ByteString value) {
@@ -1461,7 +1461,7 @@ public  final class ServerReflectionRequest extends
      * checked.
      * </pre>
      *
-     * <code>optional string list_services = 7;</code>
+     * <code>string list_services = 7;</code>
      */
     public java.lang.String getListServices() {
       java.lang.Object ref = "";
@@ -1486,7 +1486,7 @@ public  final class ServerReflectionRequest extends
      * checked.
      * </pre>
      *
-     * <code>optional string list_services = 7;</code>
+     * <code>string list_services = 7;</code>
      */
     public com.google.protobuf.ByteString
         getListServicesBytes() {
@@ -1512,7 +1512,7 @@ public  final class ServerReflectionRequest extends
      * checked.
      * </pre>
      *
-     * <code>optional string list_services = 7;</code>
+     * <code>string list_services = 7;</code>
      */
     public Builder setListServices(
         java.lang.String value) {
@@ -1530,7 +1530,7 @@ public  final class ServerReflectionRequest extends
      * checked.
      * </pre>
      *
-     * <code>optional string list_services = 7;</code>
+     * <code>string list_services = 7;</code>
      */
     public Builder clearListServices() {
       if (messageRequestCase_ == 7) {
@@ -1546,7 +1546,7 @@ public  final class ServerReflectionRequest extends
      * checked.
      * </pre>
      *
-     * <code>optional string list_services = 7;</code>
+     * <code>string list_services = 7;</code>
      */
     public Builder setListServicesBytes(
         com.google.protobuf.ByteString value) {

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequestOrBuilder.java

@@ -8,11 +8,11 @@ public interface ServerReflectionRequestOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>optional string host = 1;</code>
+   * <code>string host = 1;</code>
    */
   java.lang.String getHost();
   /**
-   * <code>optional string host = 1;</code>
+   * <code>string host = 1;</code>
    */
   com.google.protobuf.ByteString
       getHostBytes();
@@ -22,7 +22,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * Find a proto file by the file name.
    * </pre>
    *
-   * <code>optional string file_by_filename = 3;</code>
+   * <code>string file_by_filename = 3;</code>
    */
   java.lang.String getFileByFilename();
   /**
@@ -30,7 +30,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * Find a proto file by the file name.
    * </pre>
    *
-   * <code>optional string file_by_filename = 3;</code>
+   * <code>string file_by_filename = 3;</code>
    */
   com.google.protobuf.ByteString
       getFileByFilenameBytes();
@@ -42,7 +42,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
    * </pre>
    *
-   * <code>optional string file_containing_symbol = 4;</code>
+   * <code>string file_containing_symbol = 4;</code>
    */
   java.lang.String getFileContainingSymbol();
   /**
@@ -52,7 +52,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * (e.g. &lt;package&gt;.&lt;service&gt;[.&lt;method&gt;] or &lt;package&gt;.&lt;type&gt;).
    * </pre>
    *
-   * <code>optional string file_containing_symbol = 4;</code>
+   * <code>string file_containing_symbol = 4;</code>
    */
   com.google.protobuf.ByteString
       getFileContainingSymbolBytes();
@@ -63,7 +63,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * message type with the given field number.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
   io.grpc.reflection.v1alpha.ExtensionRequest getFileContainingExtension();
   /**
@@ -72,7 +72,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * message type with the given field number.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
    */
   io.grpc.reflection.v1alpha.ExtensionRequestOrBuilder getFileContainingExtensionOrBuilder();
 
@@ -88,7 +88,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string all_extension_numbers_of_type = 6;</code>
+   * <code>string all_extension_numbers_of_type = 6;</code>
    */
   java.lang.String getAllExtensionNumbersOfType();
   /**
@@ -103,7 +103,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * &lt;package&gt;.&lt;type&gt;
    * </pre>
    *
-   * <code>optional string all_extension_numbers_of_type = 6;</code>
+   * <code>string all_extension_numbers_of_type = 6;</code>
    */
   com.google.protobuf.ByteString
       getAllExtensionNumbersOfTypeBytes();
@@ -114,7 +114,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * checked.
    * </pre>
    *
-   * <code>optional string list_services = 7;</code>
+   * <code>string list_services = 7;</code>
    */
   java.lang.String getListServices();
   /**
@@ -123,7 +123,7 @@ public interface ServerReflectionRequestOrBuilder extends
    * checked.
    * </pre>
    *
-   * <code>optional string list_services = 7;</code>
+   * <code>string list_services = 7;</code>
    */
   com.google.protobuf.ByteString
       getListServicesBytes();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java

@@ -190,7 +190,7 @@ public  final class ServerReflectionResponse extends
   public static final int VALID_HOST_FIELD_NUMBER = 1;
   private volatile java.lang.Object validHost_;
   /**
-   * <code>optional string valid_host = 1;</code>
+   * <code>string valid_host = 1;</code>
    */
   public java.lang.String getValidHost() {
     java.lang.Object ref = validHost_;
@@ -205,7 +205,7 @@ public  final class ServerReflectionResponse extends
     }
   }
   /**
-   * <code>optional string valid_host = 1;</code>
+   * <code>string valid_host = 1;</code>
    */
   public com.google.protobuf.ByteString
       getValidHostBytes() {
@@ -224,19 +224,19 @@ public  final class ServerReflectionResponse extends
   public static final int ORIGINAL_REQUEST_FIELD_NUMBER = 2;
   private io.grpc.reflection.v1alpha.ServerReflectionRequest originalRequest_;
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   public boolean hasOriginalRequest() {
     return originalRequest_ != null;
   }
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   public io.grpc.reflection.v1alpha.ServerReflectionRequest getOriginalRequest() {
     return originalRequest_ == null ? io.grpc.reflection.v1alpha.ServerReflectionRequest.getDefaultInstance() : originalRequest_;
   }
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   public io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder getOriginalRequestOrBuilder() {
     return getOriginalRequest();
@@ -253,7 +253,7 @@ public  final class ServerReflectionResponse extends
    * that were previously sent in response to earlier requests in the stream.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
   public io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse() {
     if (messageResponseCase_ == 4) {
@@ -271,7 +271,7 @@ public  final class ServerReflectionResponse extends
    * that were previously sent in response to earlier requests in the stream.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
   public io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder getFileDescriptorResponseOrBuilder() {
     if (messageResponseCase_ == 4) {
@@ -286,7 +286,7 @@ public  final class ServerReflectionResponse extends
    * This message is used to answer all_extension_numbers_of_type requst.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
   public io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse() {
     if (messageResponseCase_ == 5) {
@@ -299,7 +299,7 @@ public  final class ServerReflectionResponse extends
    * This message is used to answer all_extension_numbers_of_type requst.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
   public io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder getAllExtensionNumbersResponseOrBuilder() {
     if (messageResponseCase_ == 5) {
@@ -314,7 +314,7 @@ public  final class ServerReflectionResponse extends
    * This message is used to answer list_services request.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
   public io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse() {
     if (messageResponseCase_ == 6) {
@@ -327,7 +327,7 @@ public  final class ServerReflectionResponse extends
    * This message is used to answer list_services request.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
   public io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder getListServicesResponseOrBuilder() {
     if (messageResponseCase_ == 6) {
@@ -342,7 +342,7 @@ public  final class ServerReflectionResponse extends
    * This message is used when an error occurs.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
   public io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse() {
     if (messageResponseCase_ == 7) {
@@ -355,7 +355,7 @@ public  final class ServerReflectionResponse extends
    * This message is used when an error occurs.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
   public io.grpc.reflection.v1alpha.ErrorResponseOrBuilder getErrorResponseOrBuilder() {
     if (messageResponseCase_ == 7) {
@@ -479,7 +479,7 @@ public  final class ServerReflectionResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + VALID_HOST_FIELD_NUMBER;
     hash = (53 * hash) + getValidHost().hashCode();
     if (hasOriginalRequest()) {
@@ -807,7 +807,7 @@ public  final class ServerReflectionResponse extends
 
     private java.lang.Object validHost_ = "";
     /**
-     * <code>optional string valid_host = 1;</code>
+     * <code>string valid_host = 1;</code>
      */
     public java.lang.String getValidHost() {
       java.lang.Object ref = validHost_;
@@ -822,7 +822,7 @@ public  final class ServerReflectionResponse extends
       }
     }
     /**
-     * <code>optional string valid_host = 1;</code>
+     * <code>string valid_host = 1;</code>
      */
     public com.google.protobuf.ByteString
         getValidHostBytes() {
@@ -838,7 +838,7 @@ public  final class ServerReflectionResponse extends
       }
     }
     /**
-     * <code>optional string valid_host = 1;</code>
+     * <code>string valid_host = 1;</code>
      */
     public Builder setValidHost(
         java.lang.String value) {
@@ -851,7 +851,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional string valid_host = 1;</code>
+     * <code>string valid_host = 1;</code>
      */
     public Builder clearValidHost() {
       
@@ -860,7 +860,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional string valid_host = 1;</code>
+     * <code>string valid_host = 1;</code>
      */
     public Builder setValidHostBytes(
         com.google.protobuf.ByteString value) {
@@ -878,13 +878,13 @@ public  final class ServerReflectionResponse extends
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ServerReflectionRequest, io.grpc.reflection.v1alpha.ServerReflectionRequest.Builder, io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder> originalRequestBuilder_;
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public boolean hasOriginalRequest() {
       return originalRequestBuilder_ != null || originalRequest_ != null;
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public io.grpc.reflection.v1alpha.ServerReflectionRequest getOriginalRequest() {
       if (originalRequestBuilder_ == null) {
@@ -894,7 +894,7 @@ public  final class ServerReflectionResponse extends
       }
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public Builder setOriginalRequest(io.grpc.reflection.v1alpha.ServerReflectionRequest value) {
       if (originalRequestBuilder_ == null) {
@@ -910,7 +910,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public Builder setOriginalRequest(
         io.grpc.reflection.v1alpha.ServerReflectionRequest.Builder builderForValue) {
@@ -924,7 +924,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public Builder mergeOriginalRequest(io.grpc.reflection.v1alpha.ServerReflectionRequest value) {
       if (originalRequestBuilder_ == null) {
@@ -942,7 +942,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public Builder clearOriginalRequest() {
       if (originalRequestBuilder_ == null) {
@@ -956,7 +956,7 @@ public  final class ServerReflectionResponse extends
       return this;
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public io.grpc.reflection.v1alpha.ServerReflectionRequest.Builder getOriginalRequestBuilder() {
       
@@ -964,7 +964,7 @@ public  final class ServerReflectionResponse extends
       return getOriginalRequestFieldBuilder().getBuilder();
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     public io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder getOriginalRequestOrBuilder() {
       if (originalRequestBuilder_ != null) {
@@ -975,7 +975,7 @@ public  final class ServerReflectionResponse extends
       }
     }
     /**
-     * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+     * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ServerReflectionRequest, io.grpc.reflection.v1alpha.ServerReflectionRequest.Builder, io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder> 
@@ -1003,7 +1003,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse() {
       if (fileDescriptorResponseBuilder_ == null) {
@@ -1028,7 +1028,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public Builder setFileDescriptorResponse(io.grpc.reflection.v1alpha.FileDescriptorResponse value) {
       if (fileDescriptorResponseBuilder_ == null) {
@@ -1053,7 +1053,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public Builder setFileDescriptorResponse(
         io.grpc.reflection.v1alpha.FileDescriptorResponse.Builder builderForValue) {
@@ -1076,7 +1076,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public Builder mergeFileDescriptorResponse(io.grpc.reflection.v1alpha.FileDescriptorResponse value) {
       if (fileDescriptorResponseBuilder_ == null) {
@@ -1107,7 +1107,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public Builder clearFileDescriptorResponse() {
       if (fileDescriptorResponseBuilder_ == null) {
@@ -1135,7 +1135,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public io.grpc.reflection.v1alpha.FileDescriptorResponse.Builder getFileDescriptorResponseBuilder() {
       return getFileDescriptorResponseFieldBuilder().getBuilder();
@@ -1150,7 +1150,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     public io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder getFileDescriptorResponseOrBuilder() {
       if ((messageResponseCase_ == 4) && (fileDescriptorResponseBuilder_ != null)) {
@@ -1172,7 +1172,7 @@ public  final class ServerReflectionResponse extends
      * that were previously sent in response to earlier requests in the stream.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.FileDescriptorResponse, io.grpc.reflection.v1alpha.FileDescriptorResponse.Builder, io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder> 
@@ -1200,7 +1200,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse() {
       if (allExtensionNumbersResponseBuilder_ == null) {
@@ -1220,7 +1220,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public Builder setAllExtensionNumbersResponse(io.grpc.reflection.v1alpha.ExtensionNumberResponse value) {
       if (allExtensionNumbersResponseBuilder_ == null) {
@@ -1240,7 +1240,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public Builder setAllExtensionNumbersResponse(
         io.grpc.reflection.v1alpha.ExtensionNumberResponse.Builder builderForValue) {
@@ -1258,7 +1258,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public Builder mergeAllExtensionNumbersResponse(io.grpc.reflection.v1alpha.ExtensionNumberResponse value) {
       if (allExtensionNumbersResponseBuilder_ == null) {
@@ -1284,7 +1284,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public Builder clearAllExtensionNumbersResponse() {
       if (allExtensionNumbersResponseBuilder_ == null) {
@@ -1307,7 +1307,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionNumberResponse.Builder getAllExtensionNumbersResponseBuilder() {
       return getAllExtensionNumbersResponseFieldBuilder().getBuilder();
@@ -1317,7 +1317,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     public io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder getAllExtensionNumbersResponseOrBuilder() {
       if ((messageResponseCase_ == 5) && (allExtensionNumbersResponseBuilder_ != null)) {
@@ -1334,7 +1334,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer all_extension_numbers_of_type requst.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ExtensionNumberResponse, io.grpc.reflection.v1alpha.ExtensionNumberResponse.Builder, io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder> 
@@ -1362,7 +1362,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse() {
       if (listServicesResponseBuilder_ == null) {
@@ -1382,7 +1382,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public Builder setListServicesResponse(io.grpc.reflection.v1alpha.ListServiceResponse value) {
       if (listServicesResponseBuilder_ == null) {
@@ -1402,7 +1402,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public Builder setListServicesResponse(
         io.grpc.reflection.v1alpha.ListServiceResponse.Builder builderForValue) {
@@ -1420,7 +1420,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public Builder mergeListServicesResponse(io.grpc.reflection.v1alpha.ListServiceResponse value) {
       if (listServicesResponseBuilder_ == null) {
@@ -1446,7 +1446,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public Builder clearListServicesResponse() {
       if (listServicesResponseBuilder_ == null) {
@@ -1469,7 +1469,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public io.grpc.reflection.v1alpha.ListServiceResponse.Builder getListServicesResponseBuilder() {
       return getListServicesResponseFieldBuilder().getBuilder();
@@ -1479,7 +1479,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     public io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder getListServicesResponseOrBuilder() {
       if ((messageResponseCase_ == 6) && (listServicesResponseBuilder_ != null)) {
@@ -1496,7 +1496,7 @@ public  final class ServerReflectionResponse extends
      * This message is used to answer list_services request.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ListServiceResponse, io.grpc.reflection.v1alpha.ListServiceResponse.Builder, io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder> 
@@ -1524,7 +1524,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse() {
       if (errorResponseBuilder_ == null) {
@@ -1544,7 +1544,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public Builder setErrorResponse(io.grpc.reflection.v1alpha.ErrorResponse value) {
       if (errorResponseBuilder_ == null) {
@@ -1564,7 +1564,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public Builder setErrorResponse(
         io.grpc.reflection.v1alpha.ErrorResponse.Builder builderForValue) {
@@ -1582,7 +1582,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public Builder mergeErrorResponse(io.grpc.reflection.v1alpha.ErrorResponse value) {
       if (errorResponseBuilder_ == null) {
@@ -1608,7 +1608,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public Builder clearErrorResponse() {
       if (errorResponseBuilder_ == null) {
@@ -1631,7 +1631,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public io.grpc.reflection.v1alpha.ErrorResponse.Builder getErrorResponseBuilder() {
       return getErrorResponseFieldBuilder().getBuilder();
@@ -1641,7 +1641,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     public io.grpc.reflection.v1alpha.ErrorResponseOrBuilder getErrorResponseOrBuilder() {
       if ((messageResponseCase_ == 7) && (errorResponseBuilder_ != null)) {
@@ -1658,7 +1658,7 @@ public  final class ServerReflectionResponse extends
      * This message is used when an error occurs.
      * </pre>
      *
-     * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ErrorResponse, io.grpc.reflection.v1alpha.ErrorResponse.Builder, io.grpc.reflection.v1alpha.ErrorResponseOrBuilder> 

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponseOrBuilder.java

@@ -8,25 +8,25 @@ public interface ServerReflectionResponseOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>optional string valid_host = 1;</code>
+   * <code>string valid_host = 1;</code>
    */
   java.lang.String getValidHost();
   /**
-   * <code>optional string valid_host = 1;</code>
+   * <code>string valid_host = 1;</code>
    */
   com.google.protobuf.ByteString
       getValidHostBytes();
 
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   boolean hasOriginalRequest();
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   io.grpc.reflection.v1alpha.ServerReflectionRequest getOriginalRequest();
   /**
-   * <code>optional .grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
+   * <code>.grpc.reflection.v1alpha.ServerReflectionRequest original_request = 2;</code>
    */
   io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder getOriginalRequestOrBuilder();
 
@@ -40,7 +40,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * that were previously sent in response to earlier requests in the stream.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
   io.grpc.reflection.v1alpha.FileDescriptorResponse getFileDescriptorResponse();
   /**
@@ -53,7 +53,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * that were previously sent in response to earlier requests in the stream.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
    */
   io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder getFileDescriptorResponseOrBuilder();
 
@@ -62,7 +62,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used to answer all_extension_numbers_of_type requst.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
   io.grpc.reflection.v1alpha.ExtensionNumberResponse getAllExtensionNumbersResponse();
   /**
@@ -70,7 +70,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used to answer all_extension_numbers_of_type requst.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
    */
   io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder getAllExtensionNumbersResponseOrBuilder();
 
@@ -79,7 +79,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used to answer list_services request.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
   io.grpc.reflection.v1alpha.ListServiceResponse getListServicesResponse();
   /**
@@ -87,7 +87,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used to answer list_services request.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
    */
   io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder getListServicesResponseOrBuilder();
 
@@ -96,7 +96,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used when an error occurs.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
   io.grpc.reflection.v1alpha.ErrorResponse getErrorResponse();
   /**
@@ -104,7 +104,7 @@ public interface ServerReflectionResponseOrBuilder extends
    * This message is used when an error occurs.
    * </pre>
    *
-   * <code>optional .grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
    */
   io.grpc.reflection.v1alpha.ErrorResponseOrBuilder getErrorResponseOrBuilder();
 

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java

@@ -85,7 +85,7 @@ public  final class ServiceResponse extends
    * is <package>.<service>
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -105,7 +105,7 @@ public  final class ServiceResponse extends
    * is &lt;package&gt;.&lt;service&gt;
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public com.google.protobuf.ByteString
       getNameBytes() {
@@ -173,7 +173,7 @@ public  final class ServiceResponse extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -402,7 +402,7 @@ public  final class ServiceResponse extends
      * is &lt;package&gt;.&lt;service&gt;
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -422,7 +422,7 @@ public  final class ServiceResponse extends
      * is &lt;package&gt;.&lt;service&gt;
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNameBytes() {
@@ -443,7 +443,7 @@ public  final class ServiceResponse extends
      * is &lt;package&gt;.&lt;service&gt;
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setName(
         java.lang.String value) {
@@ -461,7 +461,7 @@ public  final class ServiceResponse extends
      * is &lt;package&gt;.&lt;service&gt;
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder clearName() {
       
@@ -475,7 +475,7 @@ public  final class ServiceResponse extends
      * is &lt;package&gt;.&lt;service&gt;
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setNameBytes(
         com.google.protobuf.ByteString value) {

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponseOrBuilder.java

@@ -13,7 +13,7 @@ public interface ServiceResponseOrBuilder extends
    * is <package>.<service>
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   java.lang.String getName();
   /**
@@ -22,7 +22,7 @@ public interface ServiceResponseOrBuilder extends
    * is &lt;package&gt;.&lt;service&gt;
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   com.google.protobuf.ByteString
       getNameBytes();

services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java

@@ -177,7 +177,7 @@ public  final class DynamicReply extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java

@@ -177,7 +177,7 @@ public  final class DynamicRequest extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java

@@ -115,7 +115,7 @@ public  final class EmptyMessage extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;

services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java

@@ -297,7 +297,7 @@ public  final class NestedTypeOuter extends
           return memoizedHashCode;
         }
         int hash = 41;
-        hash = (19 * hash) + getDescriptorForType().hashCode();
+        hash = (19 * hash) + getDescriptor().hashCode();
         if (hasIval()) {
           hash = (37 * hash) + IVAL_FIELD_NUMBER;
           hash = (53 * hash) + getIval();
@@ -650,7 +650,7 @@ public  final class NestedTypeOuter extends
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -954,7 +954,7 @@ public  final class NestedTypeOuter extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;

services/src/generated/test/java/io/grpc/reflection/testing/Reply.java

@@ -177,7 +177,7 @@ public  final class Reply extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

services/src/generated/test/java/io/grpc/reflection/testing/Request.java

@@ -177,7 +177,7 @@ public  final class Request extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java

@@ -189,7 +189,7 @@ public  final class ThirdLevelType extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java

@@ -189,7 +189,7 @@ public  final class TypeWithExtensions extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (hasMessage()) {
       hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
       hash = (53 * hash) + getMessage().hashCode();

testing-proto/src/generated/main/java/com/google/protobuf/EmptyProtos.java

@@ -139,7 +139,7 @@ public final class EmptyProtos {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;

testing-proto/src/generated/main/java/io/grpc/testing/integration/Metrics.java

@@ -19,31 +19,31 @@ public final class Metrics {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     java.lang.String getName();
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     com.google.protobuf.ByteString
         getNameBytes();
 
     /**
-     * <code>optional int64 long_value = 2;</code>
+     * <code>int64 long_value = 2;</code>
      */
     long getLongValue();
 
     /**
-     * <code>optional double double_value = 3;</code>
+     * <code>double double_value = 3;</code>
      */
     double getDoubleValue();
 
     /**
-     * <code>optional string string_value = 4;</code>
+     * <code>string string_value = 4;</code>
      */
     java.lang.String getStringValue();
     /**
-     * <code>optional string string_value = 4;</code>
+     * <code>string string_value = 4;</code>
      */
     com.google.protobuf.ByteString
         getStringValueBytes();
@@ -182,7 +182,7 @@ public final class Metrics {
     public static final int NAME_FIELD_NUMBER = 1;
     private volatile java.lang.Object name_;
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -197,7 +197,7 @@ public final class Metrics {
       }
     }
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNameBytes() {
@@ -215,7 +215,7 @@ public final class Metrics {
 
     public static final int LONG_VALUE_FIELD_NUMBER = 2;
     /**
-     * <code>optional int64 long_value = 2;</code>
+     * <code>int64 long_value = 2;</code>
      */
     public long getLongValue() {
       if (valueCase_ == 2) {
@@ -226,7 +226,7 @@ public final class Metrics {
 
     public static final int DOUBLE_VALUE_FIELD_NUMBER = 3;
     /**
-     * <code>optional double double_value = 3;</code>
+     * <code>double double_value = 3;</code>
      */
     public double getDoubleValue() {
       if (valueCase_ == 3) {
@@ -237,7 +237,7 @@ public final class Metrics {
 
     public static final int STRING_VALUE_FIELD_NUMBER = 4;
     /**
-     * <code>optional string string_value = 4;</code>
+     * <code>string string_value = 4;</code>
      */
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
@@ -257,7 +257,7 @@ public final class Metrics {
       }
     }
     /**
-     * <code>optional string string_value = 4;</code>
+     * <code>string string_value = 4;</code>
      */
     public com.google.protobuf.ByteString
         getStringValueBytes() {
@@ -375,7 +375,7 @@ public final class Metrics {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + NAME_FIELD_NUMBER;
       hash = (53 * hash) + getName().hashCode();
       switch (valueCase_) {
@@ -662,7 +662,7 @@ public final class Metrics {
 
       private java.lang.Object name_ = "";
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public java.lang.String getName() {
         java.lang.Object ref = name_;
@@ -677,7 +677,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public com.google.protobuf.ByteString
           getNameBytes() {
@@ -693,7 +693,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder setName(
           java.lang.String value) {
@@ -706,7 +706,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder clearName() {
         
@@ -715,7 +715,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
@@ -730,7 +730,7 @@ public final class Metrics {
       }
 
       /**
-       * <code>optional int64 long_value = 2;</code>
+       * <code>int64 long_value = 2;</code>
        */
       public long getLongValue() {
         if (valueCase_ == 2) {
@@ -739,7 +739,7 @@ public final class Metrics {
         return 0L;
       }
       /**
-       * <code>optional int64 long_value = 2;</code>
+       * <code>int64 long_value = 2;</code>
        */
       public Builder setLongValue(long value) {
         valueCase_ = 2;
@@ -748,7 +748,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional int64 long_value = 2;</code>
+       * <code>int64 long_value = 2;</code>
        */
       public Builder clearLongValue() {
         if (valueCase_ == 2) {
@@ -760,7 +760,7 @@ public final class Metrics {
       }
 
       /**
-       * <code>optional double double_value = 3;</code>
+       * <code>double double_value = 3;</code>
        */
       public double getDoubleValue() {
         if (valueCase_ == 3) {
@@ -769,7 +769,7 @@ public final class Metrics {
         return 0D;
       }
       /**
-       * <code>optional double double_value = 3;</code>
+       * <code>double double_value = 3;</code>
        */
       public Builder setDoubleValue(double value) {
         valueCase_ = 3;
@@ -778,7 +778,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional double double_value = 3;</code>
+       * <code>double double_value = 3;</code>
        */
       public Builder clearDoubleValue() {
         if (valueCase_ == 3) {
@@ -790,7 +790,7 @@ public final class Metrics {
       }
 
       /**
-       * <code>optional string string_value = 4;</code>
+       * <code>string string_value = 4;</code>
        */
       public java.lang.String getStringValue() {
         java.lang.Object ref = "";
@@ -810,7 +810,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string string_value = 4;</code>
+       * <code>string string_value = 4;</code>
        */
       public com.google.protobuf.ByteString
           getStringValueBytes() {
@@ -831,7 +831,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string string_value = 4;</code>
+       * <code>string string_value = 4;</code>
        */
       public Builder setStringValue(
           java.lang.String value) {
@@ -844,7 +844,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string string_value = 4;</code>
+       * <code>string string_value = 4;</code>
        */
       public Builder clearStringValue() {
         if (valueCase_ == 4) {
@@ -855,7 +855,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string string_value = 4;</code>
+       * <code>string string_value = 4;</code>
        */
       public Builder setStringValueBytes(
           com.google.protobuf.ByteString value) {
@@ -922,11 +922,11 @@ public final class Metrics {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     java.lang.String getName();
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     com.google.protobuf.ByteString
         getNameBytes();
@@ -1007,7 +1007,7 @@ public final class Metrics {
     public static final int NAME_FIELD_NUMBER = 1;
     private volatile java.lang.Object name_;
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -1022,7 +1022,7 @@ public final class Metrics {
       }
     }
     /**
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNameBytes() {
@@ -1090,7 +1090,7 @@ public final class Metrics {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + NAME_FIELD_NUMBER;
       hash = (53 * hash) + getName().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -1313,7 +1313,7 @@ public final class Metrics {
 
       private java.lang.Object name_ = "";
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public java.lang.String getName() {
         java.lang.Object ref = name_;
@@ -1328,7 +1328,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public com.google.protobuf.ByteString
           getNameBytes() {
@@ -1344,7 +1344,7 @@ public final class Metrics {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder setName(
           java.lang.String value) {
@@ -1357,7 +1357,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder clearName() {
         
@@ -1366,7 +1366,7 @@ public final class Metrics {
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>string name = 1;</code>
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
@@ -1537,7 +1537,7 @@ public final class Metrics {
         return memoizedHashCode;
       }
       int hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (19 * hash) + getDescriptor().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;