Update third_party protos to 3.12.2

scalapb · Jul 4, 2020 · 0b67d06 · 0b67d06
1 parent 5c03ae5
commit 0b67d06
Show file tree

Hide file tree

Showing 30 changed files with 623 additions and 332 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ import Dependencies._
 // Different version for compiler-plugin since >=3.8.0 is not binary
 // compatible with 3.7.x. When loaded inside SBT (which has its own old
 // version), the binary incompatibility surfaces.
-val protobufCompilerVersion = "3.7.1"
+val protobufCompilerVersion = "3.12.2"
 
 val MimaPreviousVersion = "0.10.0"
 

diff --git a/...untime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala b/...untime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala
@@ -17,10 +17,14 @@ import _root_.scalapb.internal.compat.JavaConverters._
   *   problem in protoc itself -- such as the input CodeGeneratorRequest being
   *   unparseable -- should be reported by writing a message to stderr and
   *   exiting with a non-zero status code.
+  * @param supportedFeatures
+  *   A bitmask of supported features that the code generator supports.
+  *   This is a bitwise "or" of values from the Feature enum.
   */
 @SerialVersionUID(0L)
 final case class CodeGeneratorResponse(
     error: _root_.scala.Option[_root_.scala.Predef.String] = _root_.scala.None,
+    supportedFeatures: _root_.scala.Option[_root_.scala.Long] = _root_.scala.None,
     file: _root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = _root_.scala.Seq.empty,
     unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty
     ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CodeGeneratorResponse] {
@@ -32,6 +36,10 @@ final case class CodeGeneratorResponse(
         val __value = error.get
         __size += _root_.com.google.protobuf.CodedOutputStream.computeStringSize(1, __value)
       };
+      if (supportedFeatures.isDefined) {
+        val __value = supportedFeatures.get
+        __size += _root_.com.google.protobuf.CodedOutputStream.computeUInt64Size(2, __value)
+      };
       file.foreach { __item =>
         val __value = __item
         __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
@@ -52,6 +60,10 @@ final case class CodeGeneratorResponse(
         val __m = __v
         _output__.writeString(1, __m)
       };
+      supportedFeatures.foreach { __v =>
+        val __m = __v
+        _output__.writeUInt64(2, __m)
+      };
       file.foreach { __v =>
         val __m = __v
         _output__.writeTag(15, 2)
@@ -63,6 +75,9 @@ final case class CodeGeneratorResponse(
     def getError: _root_.scala.Predef.String = error.getOrElse("")
     def clearError: CodeGeneratorResponse = copy(error = _root_.scala.None)
     def withError(__v: _root_.scala.Predef.String): CodeGeneratorResponse = copy(error = Option(__v))
+    def getSupportedFeatures: _root_.scala.Long = supportedFeatures.getOrElse(0L)
+    def clearSupportedFeatures: CodeGeneratorResponse = copy(supportedFeatures = _root_.scala.None)
+    def withSupportedFeatures(__v: _root_.scala.Long): CodeGeneratorResponse = copy(supportedFeatures = Option(__v))
     def clearFile = copy(file = _root_.scala.Seq.empty)
     def addFile(__vs: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File*): CodeGeneratorResponse = addAllFile(__vs)
     def addAllFile(__vs: Iterable[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]): CodeGeneratorResponse = copy(file = file ++ __vs)
@@ -72,13 +87,15 @@ final case class CodeGeneratorResponse(
     def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = {
       (__fieldNumber: @_root_.scala.unchecked) match {
         case 1 => error.orNull
+        case 2 => supportedFeatures.orNull
         case 15 => file
       }
     }
     def getField(__field: _root_.scalapb.descriptors.FieldDescriptor): _root_.scalapb.descriptors.PValue = {
       _root_.scala.Predef.require(__field.containingMessage eq companion.scalaDescriptor)
       (__field.number: @_root_.scala.unchecked) match {
         case 1 => error.map(_root_.scalapb.descriptors.PString).getOrElse(_root_.scalapb.descriptors.PEmpty)
+        case 2 => supportedFeatures.map(_root_.scalapb.descriptors.PLong).getOrElse(_root_.scalapb.descriptors.PEmpty)
         case 15 => _root_.scalapb.descriptors.PRepeated(file.iterator.map(_.toPMessage).toVector)
       }
     }
@@ -91,15 +108,18 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
   def toJavaProto(scalaPbSource: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse = {
     val javaPbOut = com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.newBuilder
     scalaPbSource.error.foreach(javaPbOut.setError)
+    scalaPbSource.supportedFeatures.foreach(javaPbOut.setSupportedFeatures)
     javaPbOut.addAllFile(_root_.scalapb.internal.compat.toIterable(scalaPbSource.file.iterator.map(com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.toJavaProto)).asJava)
     javaPbOut.build
   }
   def fromJavaProto(javaPbSource: com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
     error = if (javaPbSource.hasError) Some(javaPbSource.getError) else _root_.scala.None,
+    supportedFeatures = if (javaPbSource.hasSupportedFeatures) Some(javaPbSource.getSupportedFeatures.longValue) else _root_.scala.None,
     file = javaPbSource.getFileList.asScala.iterator.map(com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.fromJavaProto).toSeq
   )
   def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = {
     var __error = `_message__`.error
+    var __supportedFeatures = `_message__`.supportedFeatures
     val __file = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] ++= `_message__`.file)
     var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null
     var _done__ = false
@@ -109,6 +129,8 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
         case 0 => _done__ = true
         case 10 =>
           __error = Option(_input__.readStringRequireUtf8())
+        case 16 =>
+          __supportedFeatures = Option(_input__.readUInt64())
         case 122 =>
           __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance)
         case tag =>
@@ -120,6 +142,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
     }
     com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
         error = __error,
+        supportedFeatures = __supportedFeatures,
         file = __file.result(),
         unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result()
     )
@@ -129,6 +152,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
       _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.")
       com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
         error = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Predef.String]]),
+        supportedFeatures = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Long]]),
         file = __fieldsMap.get(scalaDescriptor.findFieldByNumber(15).get).map(_.as[_root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]]).getOrElse(_root_.scala.Seq.empty)
       )
     case _ => throw new RuntimeException("Expected PMessage")
@@ -149,8 +173,53 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
   def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber)
   lazy val defaultInstance = com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
     error = _root_.scala.None,
+    supportedFeatures = _root_.scala.None,
     file = _root_.scala.Seq.empty
   )
+  /** Sync with code_generator.h.
+    */
+  sealed abstract class Feature(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum {
+    type EnumType = Feature
+    def isFeatureNone: _root_.scala.Boolean = false
+    def isFeatureProto3Optional: _root_.scala.Boolean = false
+    def companion: _root_.scalapb.GeneratedEnumCompanion[Feature] = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Feature
+    final def asRecognized: _root_.scala.Option[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Feature.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Feature.Recognized])
+  }
+
+  object Feature extends _root_.scalapb.GeneratedEnumCompanion[Feature] {
+    sealed trait Recognized extends Feature
+    implicit def enumCompanion: _root_.scalapb.GeneratedEnumCompanion[Feature] = this
+    @SerialVersionUID(0L)
+    case object FEATURE_NONE extends Feature(0) with Feature.Recognized {
+      val index = 0
+      val name = "FEATURE_NONE"
+      override def isFeatureNone: _root_.scala.Boolean = true
+    }
+
+    @SerialVersionUID(0L)
+    case object FEATURE_PROTO3_OPTIONAL extends Feature(1) with Feature.Recognized {
+      val index = 1
+      val name = "FEATURE_PROTO3_OPTIONAL"
+      override def isFeatureProto3Optional: _root_.scala.Boolean = true
+    }
+
+    @SerialVersionUID(0L)
+    final case class Unrecognized(unrecognizedValue: _root_.scala.Int) extends Feature(unrecognizedValue) with _root_.scalapb.UnrecognizedEnum
+
+    lazy val values = scala.collection.immutable.Seq(FEATURE_NONE, FEATURE_PROTO3_OPTIONAL)
+    def fromValue(__value: _root_.scala.Int): Feature = __value match {
+      case 0 => FEATURE_NONE
+      case 1 => FEATURE_PROTO3_OPTIONAL
+      case __other => Unrecognized(__other)
+    }
+    def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.javaDescriptor.getEnumTypes.get(0)
+    def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.scalaDescriptor.enums(0)
+    def fromJavaValue(pbJavaSource: com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.Feature): Feature = fromValue(pbJavaSource.getNumber)
+    def toJavaValue(pbScalaSource: Feature): com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.Feature = {
+      _root_.scala.Predef.require(!pbScalaSource.isUnrecognized, "Unrecognized enum values can not be converted to Java")
+      com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.Feature.forNumber(pbScalaSource.value)
+    }
+  }
   /** Represents a single generated file.
     *
     * @param name
@@ -374,15 +443,20 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl
   implicit class CodeGeneratorResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse](_l) {
     def error: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getError)((c_, f_) => c_.copy(error = Option(f_)))
     def optionalError: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.error)((c_, f_) => c_.copy(error = f_))
+    def supportedFeatures: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.getSupportedFeatures)((c_, f_) => c_.copy(supportedFeatures = Option(f_)))
+    def optionalSupportedFeatures: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Long]] = field(_.supportedFeatures)((c_, f_) => c_.copy(supportedFeatures = f_))
     def file: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]] = field(_.file)((c_, f_) => c_.copy(file = f_))
   }
   final val ERROR_FIELD_NUMBER = 1
+  final val SUPPORTED_FEATURES_FIELD_NUMBER = 2
   final val FILE_FIELD_NUMBER = 15
   def of(
     error: _root_.scala.Option[_root_.scala.Predef.String],
+    supportedFeatures: _root_.scala.Option[_root_.scala.Long],
     file: _root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]
   ): _root_.com.google.protobuf.compiler.plugin.CodeGeneratorResponse = _root_.com.google.protobuf.compiler.plugin.CodeGeneratorResponse(
     error,
+    supportedFeatures,
     file
   )
 }
diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/PluginProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/PluginProto.scala
@@ -24,12 +24,14 @@ object PluginProto extends _root_.scalapb.GeneratedFileObject {
   AMoCUIT4j8QEg5maWxlVG9HZW5lcmF0ZVIOZmlsZVRvR2VuZXJhdGUSLAoJcGFyYW1ldGVyGAIgASgJQg7iPwsSCXBhcmFtZXRlc
   lIJcGFyYW1ldGVyElMKCnByb3RvX2ZpbGUYDyADKAsyJC5nb29nbGUucHJvdG9idWYuRmlsZURlc2NyaXB0b3JQcm90b0IO4j8LE
   glwcm90b0ZpbGVSCXByb3RvRmlsZRJiChBjb21waWxlcl92ZXJzaW9uGAMgASgLMiEuZ29vZ2xlLnByb3RvYnVmLmNvbXBpbGVyL
-  lZlcnNpb25CFOI/ERIPY29tcGlsZXJWZXJzaW9uUg9jb21waWxlclZlcnNpb24inAIKFUNvZGVHZW5lcmF0b3JSZXNwb25zZRIgC
-  gVlcnJvchgBIAEoCUIK4j8HEgVlcnJvclIFZXJyb3ISUwoEZmlsZRgPIAMoCzI0Lmdvb2dsZS5wcm90b2J1Zi5jb21waWxlci5Db
-  2RlR2VuZXJhdG9yUmVzcG9uc2UuRmlsZUIJ4j8GEgRmaWxlUgRmaWxlGosBCgRGaWxlEh0KBG5hbWUYASABKAlCCeI/BhIEbmFtZ
-  VIEbmFtZRI8Cg9pbnNlcnRpb25fcG9pbnQYAiABKAlCE+I/EBIOaW5zZXJ0aW9uUG9pbnRSDmluc2VydGlvblBvaW50EiYKB2Nvb
-  nRlbnQYDyABKAlCDOI/CRIHY29udGVudFIHY29udGVudEJnChxjb20uZ29vZ2xlLnByb3RvYnVmLmNvbXBpbGVyQgxQbHVnaW5Qc
-  m90b3NaOWdpdGh1Yi5jb20vZ29sYW5nL3Byb3RvYnVmL3Byb3RvYy1nZW4tZ28vcGx1Z2luO3BsdWdpbl9nbw=="""
+  lZlcnNpb25CFOI/ERIPY29tcGlsZXJWZXJzaW9uUg9jb21waWxlclZlcnNpb24inQMKFUNvZGVHZW5lcmF0b3JSZXNwb25zZRIgC
+  gVlcnJvchgBIAEoCUIK4j8HEgVlcnJvclIFZXJyb3ISRQoSc3VwcG9ydGVkX2ZlYXR1cmVzGAIgASgEQhbiPxMSEXN1cHBvcnRlZ
+  EZlYXR1cmVzUhFzdXBwb3J0ZWRGZWF0dXJlcxJTCgRmaWxlGA8gAygLMjQuZ29vZ2xlLnByb3RvYnVmLmNvbXBpbGVyLkNvZGVHZ
+  W5lcmF0b3JSZXNwb25zZS5GaWxlQgniPwYSBGZpbGVSBGZpbGUaiwEKBEZpbGUSHQoEbmFtZRgBIAEoCUIJ4j8GEgRuYW1lUgRuY
+  W1lEjwKD2luc2VydGlvbl9wb2ludBgCIAEoCUIT4j8QEg5pbnNlcnRpb25Qb2ludFIOaW5zZXJ0aW9uUG9pbnQSJgoHY29udGVud
+  BgPIAEoCUIM4j8JEgdjb250ZW50Ugdjb250ZW50IjgKB0ZlYXR1cmUSEAoMRkVBVFVSRV9OT05FEAASGwoXRkVBVFVSRV9QUk9UT
+  zNfT1BUSU9OQUwQAUJnChxjb20uZ29vZ2xlLnByb3RvYnVmLmNvbXBpbGVyQgxQbHVnaW5Qcm90b3NaOWdpdGh1Yi5jb20vZ29sY
+  W5nL3Byb3RvYnVmL3Byb3RvYy1nZW4tZ28vcGx1Z2luO3BsdWdpbl9nbw=="""
       ).mkString)
   lazy val scalaDescriptor: _root_.scalapb.descriptors.FileDescriptor = {
     val scalaProto = com.google.protobuf.descriptor.FileDescriptorProto.parseFrom(ProtoBytes)

diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala
@@ -350,6 +350,11 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot
     reservedRange = _root_.scala.Seq.empty,
     reservedName = _root_.scala.Seq.empty
   )
+  /** @param start
+    *   Inclusive.
+    * @param end
+    *   Exclusive.
+    */
   @SerialVersionUID(0L)
   final case class ExtensionRange(
       start: _root_.scala.Option[_root_.scala.Int] = _root_.scala.None,