diff --git a/build.sbt b/build.sbt index d678d05d8..2876dc6c5 100644 --- a/build.sbt +++ b/build.sbt @@ -305,7 +305,7 @@ lazy val e2e = (project in file("e2e")) .settings(e2eCommonSettings) .settings( scalacOptions ++= Seq( - "-P:silencer:globalFilters=value deprecatedInt32 in class TestDeprecatedFields is deprecated", + "-P:silencer:globalFilters=eprecatedInt32 in class TestDeprecatedFields is deprecated", "-P:silencer:pathFilters=custom_options_use;CustomAnnotationProto.scala;changed/scoped;ServerReflectionGrpc.scala", "-P:silencer:lineContentFilters=import com.thesamet.pb.MisplacedMapper.weatherMapper" ), diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala index 721f78ad6..3906a4a87 100644 --- a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala +++ b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala @@ -716,45 +716,124 @@ class ProtobufGenerator( printer.addWithDelimiter(",")(constructorFields(message).map(_.fullString)) } - def generateMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { + def generateBuilder(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message) val requiredFieldMap: Map[FieldDescriptor, Int] = message.fields.filter(_.isRequired).zipWithIndex.toMap + case class Field(name: String, typeName: String, default: String, accessor: String) + + val fields = message.fieldsWithoutOneofs.map { field => + if (!field.isRepeated) + Field( + s"__${field.scalaName}", + field.scalaTypeName, + defaultValueForDefaultInstance(field), + s"_message__.${field.scalaName.asSymbol}" + ) + else + Field( + s"__${field.scalaName}", + s"collection.mutable.Builder[${field.singleScalaTypeName}, ${field.scalaTypeName}]", + field.collectionBuilder, + s"${field.collectionBuilder} ++= _message__.${field.scalaName.asSymbol}" + ) + } ++ message.getOneofs.asScala.map { oneof => + Field( + s"__${oneof.scalaName.name}", + oneof.scalaType.fullName, + oneof.empty.fullName, + s"_message__.${oneof.scalaName.nameSymbol}" + ) + } ++ (if (message.preservesUnknownFields) + Seq( + Field( + "`_unknownFields__`", + "_root_.scalapb.UnknownFieldSet.Builder", + "null", + "new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields)" + ) + ) + else Seq.empty) + printer - .add( - s"def merge(`_message__`: $myFullScalaName, `_input__`: _root_.com.google.protobuf.CodedInputStream): $myFullScalaName = {" + .add(s"final class Builder private (") + .indented( + _.addWithDelimiter(",")(fields.map(f => s"private var ${f.name}: ${f.typeName}")) ) - .indent - .print(message.fieldsWithoutOneofs)((printer, field) => - if (!field.isRepeated) - printer.add(s"var __${field.scalaName} = `_message__`.${field.scalaName.asSymbol}") - else - printer.add( - s"val __${field.scalaName} = (${field.collectionBuilder} ++= " + - s"`_message__`.${field.scalaName.asSymbol})" + .add(s") extends _root_.scalapb.MessageBuilder[$myFullScalaName] {") + .indented( + _.when(requiredFieldMap.nonEmpty) { fp => + // Sets the bit 0...(n-1) inclusive to 1. + def hexBits(n: Int): String = "0x%xL".format((0 to (n - 1)).map(i => (1L << i)).sum) + val requiredFieldCount = requiredFieldMap.size + val fullWords = (requiredFieldCount - 1) / 64 + val bits: Seq[String] = (1 to fullWords).map(_ => hexBits(64)) :+ hexBits( + requiredFieldCount - 64 * fullWords ) + fp.print(bits.zipWithIndex) { + case (fp, (bn, index)) => + fp.add(s"private var __requiredFields$index: _root_.scala.Long = $bn") + } + }.call(generateBuilderMerge(message)) + .add(s"def result(): ${myFullScalaName} = {") + .indented( + _.when(requiredFieldMap.nonEmpty) { p => + val r = (0 until (requiredFieldMap.size + 63) / 64) + .map(i => s"__requiredFields$i != 0L") + .mkString(" || ") + p.add( + s"""if (${r}) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } """ + ) + }.add(s"$myFullScalaName(") + .indented( + _.addWithDelimiter(",")( + (message.fieldsWithoutOneofs ++ message.getOneofs.asScala).map { + case e: FieldDescriptor if e.isRepeated => + s" ${e.scalaName.asSymbol} = __${e.scalaName}.result()" + case e: FieldDescriptor => + s" ${e.scalaName.asSymbol} = __${e.scalaName}" + case e: OneofDescriptor => + s" ${e.scalaName.nameSymbol} = __${e.scalaName.name}" + } ++ (if (message.preservesUnknownFields) + Seq( + " unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result()" + ) + else Seq()) + ) + ) + .add(")") + ) + .add("}") ) - .when(message.preservesUnknownFields)( - _.add( - "var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null" - ) + .add("}") + .add( + s"object Builder extends _root_.scalapb.MessageBuilderCompanion[$myFullScalaName, $myFullScalaName.Builder] {" ) - .when(requiredFieldMap.nonEmpty) { fp => - // Sets the bit 0...(n-1) inclusive to 1. - def hexBits(n: Int): String = "0x%xL".format((0 to (n - 1)).map(i => (1L << i)).sum) - val requiredFieldCount = requiredFieldMap.size - val fullWords = (requiredFieldCount - 1) / 64 - val bits: Seq[String] = (1 to fullWords).map(_ => hexBits(64)) :+ hexBits( - requiredFieldCount - 64 * fullWords - ) - fp.print(bits.zipWithIndex) { - case (fp, (bn, index)) => - fp.add(s"var __requiredFields$index: _root_.scala.Long = $bn") - } - } - .print(message.getOneofs.asScala)((printer, oneof) => - printer.add(s"var __${oneof.scalaName.name} = `_message__`.${oneof.scalaName.nameSymbol}") + .indented( + _.add("def apply(): Builder = new Builder(") + .indented( + _.addWithDelimiter(",")(fields.map(f => s"${f.name} = ${f.default}")) + ) + .add(")") + .add(s"def apply(`_message__`: $myFullScalaName): Builder = new Builder(") + .indented( + _.addWithDelimiter(",")(fields.map(f => s"${f.name} = ${f.accessor}")) + ) + .add(")") + ) + .add("}") + .add(s"def newBuilder: Builder = $myFullScalaName.Builder()") + .add(s"def newBuilder(a: $myFullScalaName): Builder = $myFullScalaName.Builder(a)") + } + + def generateBuilderMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { + val requiredFieldMap: Map[FieldDescriptor, Int] = + message.fields.filter(_.isRequired).zipWithIndex.toMap + printer + .add( + s"def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = {" ) + .indent .add(s"""var _done__ = false |while (!_done__) { | val _tag__ = _input__.readTag() @@ -770,7 +849,7 @@ class ProtobufGenerator( else { val expr = if (field.isInOneof) - s"_message__.${fieldAccessorSymbol(field)}" + s"__${fieldAccessorSymbol(field)}" else s"__${field.scalaName}" val mappedType = toBaseFieldType(field).apply(expr, field.enclosingType) @@ -829,43 +908,26 @@ class ProtobufGenerator( _.add( """ case tag => | if (_unknownFields__ == null) { - | _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + | _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() | } | _unknownFields__.parseField(tag, _input__)""".stripMargin ) ) .add(" }") .add("}") - .when(requiredFieldMap.nonEmpty) { p => - val r = (0 until (requiredFieldMap.size + 63) / 64) - .map(i => s"__requiredFields$i != 0L") - .mkString(" || ") - p.add( - s"""if (${r}) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } """ - ) - } - .add(s"$myFullScalaName(") - .indent - .addWithDelimiter(",")( - (message.fieldsWithoutOneofs ++ message.getOneofs.asScala).map { - case e: FieldDescriptor if e.isRepeated => - s" ${e.scalaName.asSymbol} = __${e.scalaName}.result()" - case e: FieldDescriptor => - s" ${e.scalaName.asSymbol} = __${e.scalaName}" - case e: OneofDescriptor => - s" ${e.scalaName.nameSymbol} = __${e.scalaName.name}" - } ++ (if (message.preservesUnknownFields) - Seq( - " unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result()" - ) - else Seq()) - ) - .outdent - .add(")") + .add("this") .outdent .add("}") } + def generateMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { + val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message) + printer + .add( + s"def merge(`_message__`: $myFullScalaName, `_input__`: _root_.com.google.protobuf.CodedInputStream): $myFullScalaName = newBuilder(_message__).merge(_input__).result()" + ) + } + def generateToJavaProto(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = { val myFullScalaName = message.scalaType.fullName printer @@ -1353,6 +1415,7 @@ class ProtobufGenerator( .call(generateNestedMessagesCompanions(message)) .call(generateEnumCompanionForField(message)) .call(generateDefaultInstance(message)) + .call(generateBuilder(message)) .print(message.getEnumTypes.asScala)(printEnum) .print(message.getOneofs.asScala)(printOneof) .print(message.nestedTypes)(printMessage) diff --git a/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala b/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala index 1757684b0..b9bce97b7 100644 --- a/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala +++ b/docs/src/main/scala/com/thesamet/docs/json/MyContainer.scala @@ -60,28 +60,7 @@ final case class MyContainer( object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyContainer] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyContainer] = this - def merge(`_message__`: com.thesamet.docs.json.MyContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyContainer = { - var __myAny = `_message__`.myAny - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __myAny = Option(_root_.scalapb.LiteParser.readMessage(_input__, __myAny.getOrElse(com.google.protobuf.any.Any.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.thesamet.docs.json.MyContainer( - myAny = __myAny, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.thesamet.docs.json.MyContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyContainer = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.thesamet.docs.json.MyContainer] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -104,6 +83,46 @@ object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.j lazy val defaultInstance = com.thesamet.docs.json.MyContainer( myAny = _root_.scala.None ) + final class Builder private ( + private var __myAny: _root_.scala.Option[com.google.protobuf.any.Any], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.thesamet.docs.json.MyContainer] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __myAny = Option(_root_.scalapb.LiteParser.readMessage(_input__, __myAny.getOrElse(com.google.protobuf.any.Any.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.thesamet.docs.json.MyContainer = { + com.thesamet.docs.json.MyContainer( + myAny = __myAny, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.thesamet.docs.json.MyContainer, com.thesamet.docs.json.MyContainer.Builder] { + def apply(): Builder = new Builder( + __myAny = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.thesamet.docs.json.MyContainer): Builder = new Builder( + __myAny = _message__.myAny, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.thesamet.docs.json.MyContainer.Builder() + def newBuilder(a: com.thesamet.docs.json.MyContainer): Builder = com.thesamet.docs.json.MyContainer.Builder(a) implicit class MyContainerLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.thesamet.docs.json.MyContainer]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.thesamet.docs.json.MyContainer](_l) { def myAny: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.any.Any] = field(_.getMyAny)((c_, f_) => c_.copy(myAny = Option(f_))) def optionalMyAny: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.any.Any]] = field(_.myAny)((c_, f_) => c_.copy(myAny = f_)) diff --git a/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala b/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala index c3ad2005f..6efc983fa 100644 --- a/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala +++ b/docs/src/main/scala/com/thesamet/docs/json/MyMessage.scala @@ -64,28 +64,7 @@ final case class MyMessage( object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyMessage] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.thesamet.docs.json.MyMessage] = this - def merge(`_message__`: com.thesamet.docs.json.MyMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyMessage = { - var __x = `_message__`.x - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __x = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.thesamet.docs.json.MyMessage( - x = __x, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.thesamet.docs.json.MyMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.thesamet.docs.json.MyMessage = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.thesamet.docs.json.MyMessage] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -102,6 +81,46 @@ object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.jso lazy val defaultInstance = com.thesamet.docs.json.MyMessage( x = 0 ) + final class Builder private ( + private var __x: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.thesamet.docs.json.MyMessage] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __x = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.thesamet.docs.json.MyMessage = { + com.thesamet.docs.json.MyMessage( + x = __x, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.thesamet.docs.json.MyMessage, com.thesamet.docs.json.MyMessage.Builder] { + def apply(): Builder = new Builder( + __x = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.thesamet.docs.json.MyMessage): Builder = new Builder( + __x = _message__.x, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.thesamet.docs.json.MyMessage.Builder() + def newBuilder(a: com.thesamet.docs.json.MyMessage): Builder = com.thesamet.docs.json.MyMessage.Builder(a) implicit class MyMessageLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.thesamet.docs.json.MyMessage]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.thesamet.docs.json.MyMessage](_l) { def x: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.x)((c_, f_) => c_.copy(x = f_)) } diff --git a/docs/src/main/scala/mytypes/duration/Duration.scala b/docs/src/main/scala/mytypes/duration/Duration.scala index c2827fd64..431607dba 100644 --- a/docs/src/main/scala/mytypes/duration/Duration.scala +++ b/docs/src/main/scala/mytypes/duration/Duration.scala @@ -64,28 +64,7 @@ final case class Duration( object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Duration] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[mytypes.duration.Duration] = this - def merge(`_message__`: mytypes.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): mytypes.duration.Duration = { - var __seconds = `_message__`.seconds - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __seconds = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - mytypes.duration.Duration( - seconds = __seconds, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: mytypes.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): mytypes.duration.Duration = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[mytypes.duration.Duration] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -102,6 +81,46 @@ object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Durat lazy val defaultInstance = mytypes.duration.Duration( seconds = 0 ) + final class Builder private ( + private var __seconds: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[mytypes.duration.Duration] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __seconds = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): mytypes.duration.Duration = { + mytypes.duration.Duration( + seconds = __seconds, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[mytypes.duration.Duration, mytypes.duration.Duration.Builder] { + def apply(): Builder = new Builder( + __seconds = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: mytypes.duration.Duration): Builder = new Builder( + __seconds = _message__.seconds, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = mytypes.duration.Duration.Builder() + def newBuilder(a: mytypes.duration.Duration): Builder = mytypes.duration.Duration.Builder(a) implicit class DurationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, mytypes.duration.Duration]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, mytypes.duration.Duration](_l) { def seconds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.seconds)((c_, f_) => c_.copy(seconds = f_)) } diff --git a/docs/src/main/scala/scalapb/docs/person/Person.scala b/docs/src/main/scala/scalapb/docs/person/Person.scala index ea1e30412..25d80bf6c 100644 --- a/docs/src/main/scala/scalapb/docs/person/Person.scala +++ b/docs/src/main/scala/scalapb/docs/person/Person.scala @@ -101,36 +101,7 @@ final case class Person( object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person] = this - def merge(`_message__`: scalapb.docs.person.Person, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person = { - var __name = `_message__`.name - var __age = `_message__`.age - val __addresses = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.docs.person.Person.Address] ++= `_message__`.addresses) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 16 => - __age = _input__.readInt32() - case 26 => - __addresses += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.docs.person.Person.Address.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.docs.person.Person( - name = __name, - age = __age, - addresses = __addresses.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.docs.person.Person, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.docs.person.Person] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -160,6 +131,58 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers age = 0, addresses = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __age: _root_.scala.Int, + private var __addresses: collection.mutable.Builder[scalapb.docs.person.Person.Address, _root_.scala.Seq[scalapb.docs.person.Person.Address]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.docs.person.Person] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 16 => + __age = _input__.readInt32() + case 26 => + __addresses += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.docs.person.Person.Address.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.docs.person.Person = { + scalapb.docs.person.Person( + name = __name, + age = __age, + addresses = __addresses.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.docs.person.Person, scalapb.docs.person.Person.Builder] { + def apply(): Builder = new Builder( + __name = "", + __age = 0, + __addresses = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.docs.person.Person.Address], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.docs.person.Person): Builder = new Builder( + __name = _message__.name, + __age = _message__.age, + __addresses = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.docs.person.Person.Address] ++= _message__.addresses, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.docs.person.Person.Builder() + def newBuilder(a: scalapb.docs.person.Person): Builder = scalapb.docs.person.Person.Builder(a) sealed abstract class AddressType(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = AddressType def isHome: _root_.scala.Boolean = false @@ -296,36 +319,7 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers object Address extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person.Address] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.docs.person.Person.Address] = this - def merge(`_message__`: scalapb.docs.person.Person.Address, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person.Address = { - var __addressType = `_message__`.addressType - var __street = `_message__`.street - var __city = `_message__`.city - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __addressType = scalapb.docs.person.Person.AddressType.fromValue(_input__.readEnum()) - case 18 => - __street = _input__.readStringRequireUtf8() - case 26 => - __city = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.docs.person.Person.Address( - addressType = __addressType, - street = __street, - city = __city, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.docs.person.Person.Address, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.docs.person.Person.Address = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.docs.person.Person.Address] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -350,6 +344,58 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers street = "", city = "" ) + final class Builder private ( + private var __addressType: scalapb.docs.person.Person.AddressType, + private var __street: _root_.scala.Predef.String, + private var __city: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.docs.person.Person.Address] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __addressType = scalapb.docs.person.Person.AddressType.fromValue(_input__.readEnum()) + case 18 => + __street = _input__.readStringRequireUtf8() + case 26 => + __city = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.docs.person.Person.Address = { + scalapb.docs.person.Person.Address( + addressType = __addressType, + street = __street, + city = __city, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.docs.person.Person.Address, scalapb.docs.person.Person.Address.Builder] { + def apply(): Builder = new Builder( + __addressType = scalapb.docs.person.Person.AddressType.HOME, + __street = "", + __city = "", + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.docs.person.Person.Address): Builder = new Builder( + __addressType = _message__.addressType, + __street = _message__.street, + __city = _message__.city, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.docs.person.Person.Address.Builder() + def newBuilder(a: scalapb.docs.person.Person.Address): Builder = scalapb.docs.person.Person.Address.Builder(a) implicit class AddressLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.docs.person.Person.Address]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.docs.person.Person.Address](_l) { def addressType: _root_.scalapb.lenses.Lens[UpperPB, scalapb.docs.person.Person.AddressType] = field(_.addressType)((c_, f_) => c_.copy(addressType = f_)) def street: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.street)((c_, f_) => c_.copy(street = f_)) diff --git a/docs/src/main/scala/scalapb/perf/protos/Enum.scala b/docs/src/main/scala/scalapb/perf/protos/Enum.scala index 3b5256fc9..c7febe095 100644 --- a/docs/src/main/scala/scalapb/perf/protos/Enum.scala +++ b/docs/src/main/scala/scalapb/perf/protos/Enum.scala @@ -64,28 +64,7 @@ final case class Enum( object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum] = this - def merge(`_message__`: scalapb.perf.protos.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.Enum = { - var __color = `_message__`.color - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __color = scalapb.perf.protos.Color.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.Enum( - color = __color, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.Enum = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.Enum] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -106,6 +85,46 @@ object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum] lazy val defaultInstance = scalapb.perf.protos.Enum( color = scalapb.perf.protos.Color.UNKNOWN ) + final class Builder private ( + private var __color: scalapb.perf.protos.Color, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.Enum] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __color = scalapb.perf.protos.Color.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.Enum = { + scalapb.perf.protos.Enum( + color = __color, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.Enum, scalapb.perf.protos.Enum.Builder] { + def apply(): Builder = new Builder( + __color = scalapb.perf.protos.Color.UNKNOWN, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.Enum): Builder = new Builder( + __color = _message__.color, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.Enum.Builder() + def newBuilder(a: scalapb.perf.protos.Enum): Builder = scalapb.perf.protos.Enum.Builder(a) implicit class EnumLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.Enum]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.Enum](_l) { def color: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.Color] = field(_.color)((c_, f_) => c_.copy(color = f_)) } diff --git a/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala b/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala index eb3f66eba..7751ced8d 100644 --- a/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala +++ b/docs/src/main/scala/scalapb/perf/protos/EnumVector.scala @@ -69,36 +69,7 @@ final case class EnumVector( object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.EnumVector] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.EnumVector] = this - def merge(`_message__`: scalapb.perf.protos.EnumVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.EnumVector = { - val __colors = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.Color] ++= `_message__`.colors) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __colors += scalapb.perf.protos.Color.fromValue(_input__.readEnum()) - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __colors += scalapb.perf.protos.Color.fromValue(_input__.readEnum) - } - _input__.popLimit(oldLimit) - } - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.EnumVector( - colors = __colors.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.EnumVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.EnumVector = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.EnumVector] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -119,6 +90,54 @@ object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos. lazy val defaultInstance = scalapb.perf.protos.EnumVector( colors = _root_.scala.Seq.empty ) + final class Builder private ( + private var __colors: collection.mutable.Builder[scalapb.perf.protos.Color, _root_.scala.Seq[scalapb.perf.protos.Color]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.EnumVector] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __colors += scalapb.perf.protos.Color.fromValue(_input__.readEnum()) + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __colors += scalapb.perf.protos.Color.fromValue(_input__.readEnum) + } + _input__.popLimit(oldLimit) + } + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.EnumVector = { + scalapb.perf.protos.EnumVector( + colors = __colors.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.EnumVector, scalapb.perf.protos.EnumVector.Builder] { + def apply(): Builder = new Builder( + __colors = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.Color], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.EnumVector): Builder = new Builder( + __colors = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.Color] ++= _message__.colors, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.EnumVector.Builder() + def newBuilder(a: scalapb.perf.protos.EnumVector): Builder = scalapb.perf.protos.EnumVector.Builder(a) implicit class EnumVectorLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.EnumVector]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.EnumVector](_l) { def colors: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[scalapb.perf.protos.Color]] = field(_.colors)((c_, f_) => c_.copy(colors = f_)) } diff --git a/docs/src/main/scala/scalapb/perf/protos/IntVector.scala b/docs/src/main/scala/scalapb/perf/protos/IntVector.scala index 570a76429..2f487b80d 100644 --- a/docs/src/main/scala/scalapb/perf/protos/IntVector.scala +++ b/docs/src/main/scala/scalapb/perf/protos/IntVector.scala @@ -69,36 +69,7 @@ final case class IntVector( object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.IntVector] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.IntVector] = this - def merge(`_message__`: scalapb.perf.protos.IntVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.IntVector = { - val __ints = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.ints) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __ints += _input__.readInt32() - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __ints += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.IntVector( - ints = __ints.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.IntVector, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.IntVector = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.IntVector] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -115,6 +86,54 @@ object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.I lazy val defaultInstance = scalapb.perf.protos.IntVector( ints = _root_.scala.Seq.empty ) + final class Builder private ( + private var __ints: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.IntVector] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __ints += _input__.readInt32() + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __ints += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.IntVector = { + scalapb.perf.protos.IntVector( + ints = __ints.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.IntVector, scalapb.perf.protos.IntVector.Builder] { + def apply(): Builder = new Builder( + __ints = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.IntVector): Builder = new Builder( + __ints = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.ints, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.IntVector.Builder() + def newBuilder(a: scalapb.perf.protos.IntVector): Builder = scalapb.perf.protos.IntVector.Builder(a) implicit class IntVectorLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.IntVector]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.IntVector](_l) { def ints: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.ints)((c_, f_) => c_.copy(ints = f_)) } diff --git a/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala b/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala index 47ca2a1a6..11248f667 100644 --- a/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala +++ b/docs/src/main/scala/scalapb/perf/protos/MessageContainer.scala @@ -80,32 +80,7 @@ final case class MessageContainer( object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.MessageContainer] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.MessageContainer] = this - def merge(`_message__`: scalapb.perf.protos.MessageContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.MessageContainer = { - var __opt = `_message__`.opt - val __rep = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.SimpleMessage] ++= `_message__`.rep) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __opt = Option(_root_.scalapb.LiteParser.readMessage(_input__, __opt.getOrElse(scalapb.perf.protos.SimpleMessage.defaultInstance))) - case 18 => - __rep += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.perf.protos.SimpleMessage.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.MessageContainer( - opt = __opt, - rep = __rep.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.MessageContainer, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.MessageContainer = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.MessageContainer] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -131,6 +106,52 @@ object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.p opt = _root_.scala.None, rep = _root_.scala.Seq.empty ) + final class Builder private ( + private var __opt: _root_.scala.Option[scalapb.perf.protos.SimpleMessage], + private var __rep: collection.mutable.Builder[scalapb.perf.protos.SimpleMessage, _root_.scala.Seq[scalapb.perf.protos.SimpleMessage]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.MessageContainer] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __opt = Option(_root_.scalapb.LiteParser.readMessage(_input__, __opt.getOrElse(scalapb.perf.protos.SimpleMessage.defaultInstance))) + case 18 => + __rep += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.perf.protos.SimpleMessage.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.MessageContainer = { + scalapb.perf.protos.MessageContainer( + opt = __opt, + rep = __rep.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.MessageContainer, scalapb.perf.protos.MessageContainer.Builder] { + def apply(): Builder = new Builder( + __opt = _root_.scala.None, + __rep = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.SimpleMessage], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.MessageContainer): Builder = new Builder( + __opt = _message__.opt, + __rep = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.perf.protos.SimpleMessage] ++= _message__.rep, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.MessageContainer.Builder() + def newBuilder(a: scalapb.perf.protos.MessageContainer): Builder = scalapb.perf.protos.MessageContainer.Builder(a) implicit class MessageContainerLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.MessageContainer]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.MessageContainer](_l) { def opt: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.SimpleMessage] = field(_.getOpt)((c_, f_) => c_.copy(opt = Option(f_))) def optionalOpt: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[scalapb.perf.protos.SimpleMessage]] = field(_.opt)((c_, f_) => c_.copy(opt = f_)) diff --git a/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala b/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala index 4ed400c0a..ddc84a326 100644 --- a/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala +++ b/docs/src/main/scala/scalapb/perf/protos/SimpleMessage.scala @@ -124,40 +124,7 @@ final case class SimpleMessage( object SimpleMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.SimpleMessage] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.SimpleMessage] = this - def merge(`_message__`: scalapb.perf.protos.SimpleMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.SimpleMessage = { - var __i = `_message__`.i - var __j = `_message__`.j - var __k = `_message__`.k - var __color = `_message__`.color - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __i = _input__.readInt32() - case 16 => - __j = _input__.readInt32() - case 26 => - __k = _input__.readBytes() - case 32 => - __color = scalapb.perf.protos.Color.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.SimpleMessage( - i = __i, - j = __j, - k = __k, - color = __color, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.SimpleMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.SimpleMessage = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.SimpleMessage] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -184,6 +151,64 @@ object SimpleMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.prot k = _root_.com.google.protobuf.ByteString.EMPTY, color = scalapb.perf.protos.Color.UNKNOWN ) + final class Builder private ( + private var __i: _root_.scala.Int, + private var __j: _root_.scala.Int, + private var __k: _root_.com.google.protobuf.ByteString, + private var __color: scalapb.perf.protos.Color, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.SimpleMessage] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __i = _input__.readInt32() + case 16 => + __j = _input__.readInt32() + case 26 => + __k = _input__.readBytes() + case 32 => + __color = scalapb.perf.protos.Color.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.SimpleMessage = { + scalapb.perf.protos.SimpleMessage( + i = __i, + j = __j, + k = __k, + color = __color, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.SimpleMessage, scalapb.perf.protos.SimpleMessage.Builder] { + def apply(): Builder = new Builder( + __i = 0, + __j = 0, + __k = _root_.com.google.protobuf.ByteString.EMPTY, + __color = scalapb.perf.protos.Color.UNKNOWN, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.SimpleMessage): Builder = new Builder( + __i = _message__.i, + __j = _message__.j, + __k = _message__.k, + __color = _message__.color, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.SimpleMessage.Builder() + def newBuilder(a: scalapb.perf.protos.SimpleMessage): Builder = scalapb.perf.protos.SimpleMessage.Builder(a) implicit class SimpleMessageLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.SimpleMessage]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.SimpleMessage](_l) { def i: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.i)((c_, f_) => c_.copy(i = f_)) def j: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.j)((c_, f_) => c_.copy(j = f_)) diff --git a/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala b/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala index 429c60d0b..a0f232ae0 100644 --- a/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala +++ b/docs/src/main/scala/scalapb/perf/protos/StringMessage.scala @@ -84,32 +84,7 @@ final case class StringMessage( object StringMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.StringMessage] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.perf.protos.StringMessage] = this - def merge(`_message__`: scalapb.perf.protos.StringMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.StringMessage = { - var __str1 = `_message__`.str1 - var __str2 = `_message__`.str2 - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __str1 = _input__.readStringRequireUtf8() - case 18 => - __str2 = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.perf.protos.StringMessage( - str1 = __str1, - str2 = __str2, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.perf.protos.StringMessage, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.perf.protos.StringMessage = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.perf.protos.StringMessage] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -128,6 +103,52 @@ object StringMessage extends scalapb.GeneratedMessageCompanion[scalapb.perf.prot str1 = "", str2 = "" ) + final class Builder private ( + private var __str1: _root_.scala.Predef.String, + private var __str2: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.perf.protos.StringMessage] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __str1 = _input__.readStringRequireUtf8() + case 18 => + __str2 = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.perf.protos.StringMessage = { + scalapb.perf.protos.StringMessage( + str1 = __str1, + str2 = __str2, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.perf.protos.StringMessage, scalapb.perf.protos.StringMessage.Builder] { + def apply(): Builder = new Builder( + __str1 = "", + __str2 = "", + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.perf.protos.StringMessage): Builder = new Builder( + __str1 = _message__.str1, + __str2 = _message__.str2, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.perf.protos.StringMessage.Builder() + def newBuilder(a: scalapb.perf.protos.StringMessage): Builder = scalapb.perf.protos.StringMessage.Builder(a) implicit class StringMessageLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.perf.protos.StringMessage]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.perf.protos.StringMessage](_l) { def str1: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.str1)((c_, f_) => c_.copy(str1 = f_)) def str2: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.str2)((c_, f_) => c_.copy(str2 = f_)) diff --git a/e2e/src/main/scala-2.12/com/thesamet/pb/MyMap.scala b/e2e/src/main/scala-2.12/com/thesamet/pb/MyMap.scala index ccbcdc814..5f63e31f5 100644 --- a/e2e/src/main/scala-2.12/com/thesamet/pb/MyMap.scala +++ b/e2e/src/main/scala-2.12/com/thesamet/pb/MyMap.scala @@ -30,15 +30,17 @@ object MyMap { override def apply(): mutable.Builder[(K, V), MyMap[K, V]] = vcbf().mapResult(MyMap(_)) } - class Builder[K, V] { + class Builder[K, V] extends collection.mutable.Builder[(K, V), MyMap[K, V]] { private val underlying = Map.newBuilder[K, V] + def clear(): Unit = underlying.clear() + def ++=(other: MyMap[K, V]): Builder[K, V] = { underlying ++= other.stuff; this } - def +=(other: (K, V)): Unit = underlying += other + def +=(other: (K, V)): this.type = { underlying += other; this } def result(): MyMap[K, V] = MyMap(underlying.result()) } diff --git a/e2e/src/main/scala-2.12/com/thesamet/pb/MyVector.scala b/e2e/src/main/scala-2.12/com/thesamet/pb/MyVector.scala index 50379ccf8..2440af609 100644 --- a/e2e/src/main/scala-2.12/com/thesamet/pb/MyVector.scala +++ b/e2e/src/main/scala-2.12/com/thesamet/pb/MyVector.scala @@ -30,15 +30,17 @@ object MyVector { override def apply(): mutable.Builder[T, MyVector[T]] = vcbf().mapResult(MyVector(_)) } - class Builder[T] { + class Builder[T] extends collection.mutable.Builder[T, MyVector[T]] { private val underlying = Vector.newBuilder[T] - def ++=(other: MyVector[T]): Builder[T] = { + def clear(): Unit = underlying.clear() + + def ++=(other: MyVector[T]): this.type = { underlying ++= other.stuff; this } - def +=(other: T): Unit = underlying += other + def +=(other: T): this.type = { underlying += other; this } def result(): MyVector[T] = MyVector(underlying.result()) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1a70ad207..f516435f3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val utest = "0.7.4" val fastparse = "2.3.0" val silencer = "1.6.0" - val collectionCompat = "2.1.6" + val collectionCompat = "2.3.2" val coursier = "2.0.0-RC6-21" val mockito = "3.2.0" val protocGen = "0.9.0-RC6" diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala index 97c836669..5f27e1e05 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/any/Any.scala @@ -205,32 +205,7 @@ object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any typeUrl = javaPbSource.getTypeUrl, value = javaPbSource.getValue ) - def merge(`_message__`: com.google.protobuf.any.Any, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = { - var __typeUrl = `_message__`.typeUrl - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __typeUrl = _input__.readStringRequireUtf8() - case 18 => - __value = _input__.readBytes() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.any.Any( - typeUrl = __typeUrl, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.any.Any, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.any.Any] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -249,6 +224,52 @@ object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any typeUrl = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) + final class Builder private ( + private var __typeUrl: _root_.scala.Predef.String, + private var __value: _root_.com.google.protobuf.ByteString, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.any.Any] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __typeUrl = _input__.readStringRequireUtf8() + case 18 => + __value = _input__.readBytes() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.any.Any = { + com.google.protobuf.any.Any( + typeUrl = __typeUrl, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.any.Any, com.google.protobuf.any.Any.Builder] { + def apply(): Builder = new Builder( + __typeUrl = "", + __value = _root_.com.google.protobuf.ByteString.EMPTY, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.any.Any): Builder = new Builder( + __typeUrl = _message__.typeUrl, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.any.Any.Builder() + def newBuilder(a: com.google.protobuf.any.Any): Builder = com.google.protobuf.any.Any.Builder(a) implicit class AnyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.any.Any]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.any.Any](_l) { def typeUrl: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.typeUrl)((c_, f_) => c_.copy(typeUrl = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala index d3f54ac72..0549971a8 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Api.scala @@ -237,52 +237,7 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api mixins = javaPbSource.getMixinsList.asScala.iterator.map(com.google.protobuf.api.Mixin.fromJavaProto).toSeq, syntax = com.google.protobuf.`type`.Syntax.fromValue(javaPbSource.getSyntaxValue.intValue) ) - def merge(`_message__`: com.google.protobuf.api.Api, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = { - var __name = `_message__`.name - val __methods = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method] ++= `_message__`.methods) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __version = `_message__`.version - var __sourceContext = `_message__`.sourceContext - val __mixins = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin] ++= `_message__`.mixins) - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance) - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 34 => - __version = _input__.readStringRequireUtf8() - case 42 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 50 => - __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance) - case 56 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Api( - name = __name, - methods = __methods.result(), - options = __options.result(), - version = __version, - sourceContext = __sourceContext, - mixins = __mixins.result(), - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Api, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Api] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -324,6 +279,82 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api mixins = _root_.scala.Seq.empty, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __methods: collection.mutable.Builder[com.google.protobuf.api.Method, _root_.scala.Seq[com.google.protobuf.api.Method]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __version: _root_.scala.Predef.String, + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __mixins: collection.mutable.Builder[com.google.protobuf.api.Mixin, _root_.scala.Seq[com.google.protobuf.api.Mixin]], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Api] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance) + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 34 => + __version = _input__.readStringRequireUtf8() + case 42 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 50 => + __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance) + case 56 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Api = { + com.google.protobuf.api.Api( + name = __name, + methods = __methods.result(), + options = __options.result(), + version = __version, + sourceContext = __sourceContext, + mixins = __mixins.result(), + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Api, com.google.protobuf.api.Api.Builder] { + def apply(): Builder = new Builder( + __name = "", + __methods = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __version = "", + __sourceContext = _root_.scala.None, + __mixins = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin], + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Api): Builder = new Builder( + __name = _message__.name, + __methods = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method] ++= _message__.methods, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __version = _message__.version, + __sourceContext = _message__.sourceContext, + __mixins = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin] ++= _message__.mixins, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Api.Builder() + def newBuilder(a: com.google.protobuf.api.Api): Builder = com.google.protobuf.api.Api.Builder(a) implicit class ApiLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Api]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Api](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def methods: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.api.Method]] = field(_.methods)((c_, f_) => c_.copy(methods = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala index 8888b9549..b0e99addf 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Method.scala @@ -219,52 +219,7 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api. options = javaPbSource.getOptionsList.asScala.iterator.map(com.google.protobuf.`type`.OptionProto.fromJavaProto).toSeq, syntax = com.google.protobuf.`type`.Syntax.fromValue(javaPbSource.getSyntaxValue.intValue) ) - def merge(`_message__`: com.google.protobuf.api.Method, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = { - var __name = `_message__`.name - var __requestTypeUrl = `_message__`.requestTypeUrl - var __requestStreaming = `_message__`.requestStreaming - var __responseTypeUrl = `_message__`.responseTypeUrl - var __responseStreaming = `_message__`.responseStreaming - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __requestTypeUrl = _input__.readStringRequireUtf8() - case 24 => - __requestStreaming = _input__.readBool() - case 34 => - __responseTypeUrl = _input__.readStringRequireUtf8() - case 40 => - __responseStreaming = _input__.readBool() - case 50 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 56 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Method( - name = __name, - requestTypeUrl = __requestTypeUrl, - requestStreaming = __requestStreaming, - responseTypeUrl = __responseTypeUrl, - responseStreaming = __responseStreaming, - options = __options.result(), - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Method, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Method] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -303,6 +258,82 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api. options = _root_.scala.Seq.empty, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __requestTypeUrl: _root_.scala.Predef.String, + private var __requestStreaming: _root_.scala.Boolean, + private var __responseTypeUrl: _root_.scala.Predef.String, + private var __responseStreaming: _root_.scala.Boolean, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Method] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __requestTypeUrl = _input__.readStringRequireUtf8() + case 24 => + __requestStreaming = _input__.readBool() + case 34 => + __responseTypeUrl = _input__.readStringRequireUtf8() + case 40 => + __responseStreaming = _input__.readBool() + case 50 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 56 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Method = { + com.google.protobuf.api.Method( + name = __name, + requestTypeUrl = __requestTypeUrl, + requestStreaming = __requestStreaming, + responseTypeUrl = __responseTypeUrl, + responseStreaming = __responseStreaming, + options = __options.result(), + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Method, com.google.protobuf.api.Method.Builder] { + def apply(): Builder = new Builder( + __name = "", + __requestTypeUrl = "", + __requestStreaming = false, + __responseTypeUrl = "", + __responseStreaming = false, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Method): Builder = new Builder( + __name = _message__.name, + __requestTypeUrl = _message__.requestTypeUrl, + __requestStreaming = _message__.requestStreaming, + __responseTypeUrl = _message__.responseTypeUrl, + __responseStreaming = _message__.responseStreaming, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Method.Builder() + def newBuilder(a: com.google.protobuf.api.Method): Builder = com.google.protobuf.api.Method.Builder(a) implicit class MethodLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Method]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Method](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def requestTypeUrl: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.requestTypeUrl)((c_, f_) => c_.copy(requestTypeUrl = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala index acea673a5..accb2d6fc 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/api/Mixin.scala @@ -179,32 +179,7 @@ object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.M name = javaPbSource.getName, root = javaPbSource.getRoot ) - def merge(`_message__`: com.google.protobuf.api.Mixin, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = { - var __name = `_message__`.name - var __root = `_message__`.root - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __root = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Mixin( - name = __name, - root = __root, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Mixin, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Mixin] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -223,6 +198,52 @@ object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.M name = "", root = "" ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __root: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Mixin] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __root = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Mixin = { + com.google.protobuf.api.Mixin( + name = __name, + root = __root, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Mixin, com.google.protobuf.api.Mixin.Builder] { + def apply(): Builder = new Builder( + __name = "", + __root = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Mixin): Builder = new Builder( + __name = _message__.name, + __root = _message__.root, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Mixin.Builder() + def newBuilder(a: com.google.protobuf.api.Mixin): Builder = com.google.protobuf.api.Mixin.Builder(a) implicit class MixinLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Mixin]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Mixin](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def root: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.root)((c_, f_) => c_.copy(root = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala index 52f1ca063..1c544a761 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala @@ -147,40 +147,7 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google protoFile = javaPbSource.getProtoFileList.asScala.iterator.map(com.google.protobuf.descriptor.FileDescriptorProto.fromJavaProto).toSeq, compilerVersion = if (javaPbSource.hasCompilerVersion) Some(com.google.protobuf.compiler.plugin.Version.fromJavaProto(javaPbSource.getCompilerVersion)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = { - val __fileToGenerate = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.fileToGenerate) - var __parameter = `_message__`.parameter - val __protoFile = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= `_message__`.protoFile) - var __compilerVersion = `_message__`.compilerVersion - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fileToGenerate += _input__.readStringRequireUtf8() - case 18 => - __parameter = Option(_input__.readStringRequireUtf8()) - case 122 => - __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) - case 26 => - __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorRequest( - fileToGenerate = __fileToGenerate.result(), - parameter = __parameter, - protoFile = __protoFile.result(), - compilerVersion = __compilerVersion, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -210,6 +177,64 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google protoFile = _root_.scala.Seq.empty, compilerVersion = _root_.scala.None ) + final class Builder private ( + private var __fileToGenerate: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __parameter: _root_.scala.Option[_root_.scala.Predef.String], + private var __protoFile: collection.mutable.Builder[com.google.protobuf.descriptor.FileDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]], + private var __compilerVersion: _root_.scala.Option[com.google.protobuf.compiler.plugin.Version], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fileToGenerate += _input__.readStringRequireUtf8() + case 18 => + __parameter = Option(_input__.readStringRequireUtf8()) + case 122 => + __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) + case 26 => + __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = { + com.google.protobuf.compiler.plugin.CodeGeneratorRequest( + fileToGenerate = __fileToGenerate.result(), + parameter = __parameter, + protoFile = __protoFile.result(), + compilerVersion = __compilerVersion, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest, com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder] { + def apply(): Builder = new Builder( + __fileToGenerate = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __parameter = _root_.scala.None, + __protoFile = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto], + __compilerVersion = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest): Builder = new Builder( + __fileToGenerate = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.fileToGenerate, + __parameter = _message__.parameter, + __protoFile = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= _message__.protoFile, + __compilerVersion = _message__.compilerVersion, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorRequest): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder(a) implicit class CodeGeneratorRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorRequest](_l) { def fileToGenerate: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.fileToGenerate)((c_, f_) => c_.copy(fileToGenerate = f_)) def parameter: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getParameter)((c_, f_) => c_.copy(parameter = Option(f_))) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala index fe9da12ef..2266ef15a 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala @@ -98,32 +98,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl error = if (javaPbSource.hasError) Some(javaPbSource.getError) 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 - 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 - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __error = Option(_input__.readStringRequireUtf8()) - case 122 => - __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorResponse( - error = __error, - file = __file.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -151,6 +126,52 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl error = _root_.scala.None, file = _root_.scala.Seq.empty ) + final class Builder private ( + private var __error: _root_.scala.Option[_root_.scala.Predef.String], + private var __file: collection.mutable.Builder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, _root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __error = Option(_input__.readStringRequireUtf8()) + case 122 => + __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = { + com.google.protobuf.compiler.plugin.CodeGeneratorResponse( + error = __error, + file = __file.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder] { + def apply(): Builder = new Builder( + __error = _root_.scala.None, + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): Builder = new Builder( + __error = _message__.error, + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] ++= _message__.file, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder(a) /** Represents a single generated file. * * @param name @@ -299,36 +320,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl insertionPoint = if (javaPbSource.hasInsertionPoint) Some(javaPbSource.getInsertionPoint) else _root_.scala.None, content = if (javaPbSource.hasContent) Some(javaPbSource.getContent) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = { - var __name = `_message__`.name - var __insertionPoint = `_message__`.insertionPoint - var __content = `_message__`.content - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __insertionPoint = Option(_input__.readStringRequireUtf8()) - case 122 => - __content = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File( - name = __name, - insertionPoint = __insertionPoint, - content = __content, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -349,6 +341,58 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl insertionPoint = _root_.scala.None, content = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __insertionPoint: _root_.scala.Option[_root_.scala.Predef.String], + private var __content: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __insertionPoint = Option(_input__.readStringRequireUtf8()) + case 122 => + __content = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = { + com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File( + name = __name, + insertionPoint = __insertionPoint, + content = __content, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __insertionPoint = _root_.scala.None, + __content = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File): Builder = new Builder( + __name = _message__.name, + __insertionPoint = _message__.insertionPoint, + __content = _message__.content, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder(a) implicit class FileLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala index 1954dc624..51c79fd62 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala @@ -120,40 +120,7 @@ object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.com patch = if (javaPbSource.hasPatch) Some(javaPbSource.getPatch.intValue) else _root_.scala.None, suffix = if (javaPbSource.hasSuffix) Some(javaPbSource.getSuffix) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.compiler.plugin.Version, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = { - var __major = `_message__`.major - var __minor = `_message__`.minor - var __patch = `_message__`.patch - var __suffix = `_message__`.suffix - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __major = Option(_input__.readInt32()) - case 16 => - __minor = Option(_input__.readInt32()) - case 24 => - __patch = Option(_input__.readInt32()) - case 34 => - __suffix = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.Version( - major = __major, - minor = __minor, - patch = __patch, - suffix = __suffix, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.Version, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.Version] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -176,6 +143,64 @@ object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.com patch = _root_.scala.None, suffix = _root_.scala.None ) + final class Builder private ( + private var __major: _root_.scala.Option[_root_.scala.Int], + private var __minor: _root_.scala.Option[_root_.scala.Int], + private var __patch: _root_.scala.Option[_root_.scala.Int], + private var __suffix: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.Version] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __major = Option(_input__.readInt32()) + case 16 => + __minor = Option(_input__.readInt32()) + case 24 => + __patch = Option(_input__.readInt32()) + case 34 => + __suffix = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.Version = { + com.google.protobuf.compiler.plugin.Version( + major = __major, + minor = __minor, + patch = __patch, + suffix = __suffix, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.Version, com.google.protobuf.compiler.plugin.Version.Builder] { + def apply(): Builder = new Builder( + __major = _root_.scala.None, + __minor = _root_.scala.None, + __patch = _root_.scala.None, + __suffix = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.Version): Builder = new Builder( + __major = _message__.major, + __minor = _message__.minor, + __patch = _message__.patch, + __suffix = _message__.suffix, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.Version.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.Version): Builder = com.google.protobuf.compiler.plugin.Version.Builder(a) implicit class VersionLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.Version]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.Version](_l) { def major: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getMajor)((c_, f_) => c_.copy(major = Option(f_))) def optionalMajor: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.major)((c_, f_) => c_.copy(major = f_)) 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 index 3a81d46c1..4b5aa8e45 100644 --- 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 @@ -241,64 +241,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot reservedRange = javaPbSource.getReservedRangeList.asScala.iterator.map(com.google.protobuf.descriptor.DescriptorProto.ReservedRange.fromJavaProto).toSeq, reservedName = javaPbSource.getReservedNameList.asScala.iterator.map(_root_.scala.Predef.identity).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = { - var __name = `_message__`.name - val __field = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.field) - val __extension = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.extension) - val __nestedType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= `_message__`.nestedType) - val __enumType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= `_message__`.enumType) - val __extensionRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] ++= `_message__`.extensionRange) - val __oneofDecl = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] ++= `_message__`.oneofDecl) - var __options = `_message__`.options - val __reservedRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] ++= `_message__`.reservedRange) - val __reservedName = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.reservedName) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 50 => - __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 26 => - __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) - case 34 => - __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) - case 42 => - __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance) - case 66 => - __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance) - case 58 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance))) - case 74 => - __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance) - case 82 => - __reservedName += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto( - name = __name, - field = __field.result(), - extension = __extension.result(), - nestedType = __nestedType.result(), - enumType = __enumType.result(), - extensionRange = __extensionRange.result(), - oneofDecl = __oneofDecl.result(), - options = __options, - reservedRange = __reservedRange.result(), - reservedName = __reservedName.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -350,6 +293,100 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot reservedRange = _root_.scala.Seq.empty, reservedName = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __field: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __extension: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __nestedType: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto]], + private var __enumType: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto]], + private var __extensionRange: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange]], + private var __oneofDecl: collection.mutable.Builder[com.google.protobuf.descriptor.OneofDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.OneofDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.MessageOptions], + private var __reservedRange: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto.ReservedRange]], + private var __reservedName: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 50 => + __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 26 => + __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) + case 34 => + __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) + case 42 => + __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance) + case 66 => + __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance) + case 58 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance))) + case 74 => + __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance) + case 82 => + __reservedName += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto = { + com.google.protobuf.descriptor.DescriptorProto( + name = __name, + field = __field.result(), + extension = __extension.result(), + nestedType = __nestedType.result(), + enumType = __enumType.result(), + extensionRange = __extensionRange.result(), + oneofDecl = __oneofDecl.result(), + options = __options, + reservedRange = __reservedRange.result(), + reservedName = __reservedName.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto, com.google.protobuf.descriptor.DescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __field = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __nestedType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto], + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto], + __extensionRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange], + __oneofDecl = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto], + __options = _root_.scala.None, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange], + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto): Builder = new Builder( + __name = _message__.name, + __field = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.field, + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.extension, + __nestedType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= _message__.nestedType, + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= _message__.enumType, + __extensionRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] ++= _message__.extensionRange, + __oneofDecl = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] ++= _message__.oneofDecl, + __options = _message__.options, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] ++= _message__.reservedRange, + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.reservedName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto): Builder = com.google.protobuf.descriptor.DescriptorProto.Builder(a) @SerialVersionUID(0L) final case class ExtensionRange( start: _root_.scala.Option[_root_.scala.Int] = _root_.scala.None, @@ -445,36 +482,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot end = if (javaPbSource.hasEnd) Some(javaPbSource.getEnd.intValue) else _root_.scala.None, options = if (javaPbSource.hasOptions) Some(com.google.protobuf.descriptor.ExtensionRangeOptions.fromJavaProto(javaPbSource.getOptions)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto.ExtensionRange( - start = __start, - end = __end, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -501,6 +509,58 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot end = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.ExtensionRangeOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = { + com.google.protobuf.descriptor.DescriptorProto.ExtensionRange( + start = __start, + end = __end, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange): Builder = com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder(a) implicit class ExtensionRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) @@ -610,32 +670,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot start = if (javaPbSource.hasStart) Some(javaPbSource.getStart.intValue) else _root_.scala.None, end = if (javaPbSource.hasEnd) Some(javaPbSource.getEnd.intValue) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto.ReservedRange( - start = __start, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -654,6 +689,52 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot start = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = { + com.google.protobuf.descriptor.DescriptorProto.ReservedRange( + start = __start, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto.ReservedRange): Builder = com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder(a) implicit class ReservedRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ReservedRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ReservedRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala index c3749511c..162daacc8 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala @@ -150,44 +150,7 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. reservedRange = javaPbSource.getReservedRangeList.asScala.iterator.map(com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.fromJavaProto).toSeq, reservedName = javaPbSource.getReservedNameList.asScala.iterator.map(_root_.scala.Predef.identity).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = { - var __name = `_message__`.name - val __value = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] ++= `_message__`.value) - var __options = `_message__`.options - val __reservedRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] ++= `_message__`.reservedRange) - val __reservedName = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.reservedName) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance))) - case 34 => - __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance) - case 42 => - __reservedName += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumDescriptorProto( - name = __name, - value = __value.result(), - options = __options, - reservedRange = __reservedRange.result(), - reservedName = __reservedName.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -223,6 +186,70 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. reservedRange = _root_.scala.Seq.empty, reservedName = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __value: collection.mutable.Builder[com.google.protobuf.descriptor.EnumValueDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumValueDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.EnumOptions], + private var __reservedRange: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange]], + private var __reservedName: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance))) + case 34 => + __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance) + case 42 => + __reservedName += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumDescriptorProto = { + com.google.protobuf.descriptor.EnumDescriptorProto( + name = __name, + value = __value.result(), + options = __options, + reservedRange = __reservedRange.result(), + reservedName = __reservedName.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumDescriptorProto, com.google.protobuf.descriptor.EnumDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __value = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto], + __options = _root_.scala.None, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange], + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto): Builder = new Builder( + __name = _message__.name, + __value = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] ++= _message__.value, + __options = _message__.options, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] ++= _message__.reservedRange, + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.reservedName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumDescriptorProto): Builder = com.google.protobuf.descriptor.EnumDescriptorProto.Builder(a) /** Range of reserved numeric values. Reserved values may not be used by * entries in the same enum. Reserved ranges may not overlap. * @@ -312,32 +339,7 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. start = if (javaPbSource.hasStart) Some(javaPbSource.getStart.intValue) else _root_.scala.None, end = if (javaPbSource.hasEnd) Some(javaPbSource.getEnd.intValue) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange( - start = __start, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -356,6 +358,52 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. start = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = { + com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange( + start = __start, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange): Builder = com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder(a) implicit class EnumReservedRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala index 29cc19692..cf9f2c5f8 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala @@ -113,36 +113,7 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf deprecated = if (javaPbSource.hasDeprecated) Some(javaPbSource.getDeprecated.booleanValue) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = { - var __allowAlias = `_message__`.allowAlias - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 16 => - __allowAlias = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumOptions( - allowAlias = __allowAlias, - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -169,6 +140,58 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __allowAlias: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 16 => + __allowAlias = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumOptions = { + com.google.protobuf.descriptor.EnumOptions( + allowAlias = __allowAlias, + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumOptions, com.google.protobuf.descriptor.EnumOptions.Builder] { + def apply(): Builder = new Builder( + __allowAlias = _root_.scala.None, + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumOptions): Builder = new Builder( + __allowAlias = _message__.allowAlias, + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumOptions): Builder = com.google.protobuf.descriptor.EnumOptions.Builder(a) implicit class EnumOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumOptions](_l) { def allowAlias: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getAllowAlias)((c_, f_) => c_.copy(allowAlias = Option(f_))) def optionalAllowAlias: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.allowAlias)((c_, f_) => c_.copy(allowAlias = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala index b803f6686..5ebbcf75f 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala @@ -102,36 +102,7 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go number = if (javaPbSource.hasNumber) Some(javaPbSource.getNumber.intValue) else _root_.scala.None, options = if (javaPbSource.hasOptions) Some(com.google.protobuf.descriptor.EnumValueOptions.fromJavaProto(javaPbSource.getOptions)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = { - var __name = `_message__`.name - var __number = `_message__`.number - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 16 => - __number = Option(_input__.readInt32()) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumValueDescriptorProto( - name = __name, - number = __number, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -158,6 +129,58 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go number = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __number: _root_.scala.Option[_root_.scala.Int], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.EnumValueOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 16 => + __number = Option(_input__.readInt32()) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumValueDescriptorProto = { + com.google.protobuf.descriptor.EnumValueDescriptorProto( + name = __name, + number = __number, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto, com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __number = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumValueDescriptorProto): Builder = com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder(a) implicit class EnumValueDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumValueDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumValueDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala index 099a5182f..98708c059 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala @@ -94,32 +94,7 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro deprecated = if (javaPbSource.hasDeprecated) Some(javaPbSource.getDeprecated.booleanValue) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = { - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumValueOptions( - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -144,6 +119,52 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumValueOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumValueOptions = { + com.google.protobuf.descriptor.EnumValueOptions( + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumValueOptions, com.google.protobuf.descriptor.EnumValueOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumValueOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumValueOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumValueOptions): Builder = com.google.protobuf.descriptor.EnumValueOptions.Builder(a) implicit class EnumValueOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumValueOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumValueOptions](_l) { def deprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getDeprecated)((c_, f_) => c_.copy(deprecated = Option(f_))) def optionalDeprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.deprecated)((c_, f_) => c_.copy(deprecated = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala index f22af0c07..cc7533e07 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala @@ -73,28 +73,7 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl def fromJavaProto(javaPbSource: com.google.protobuf.DescriptorProtos.ExtensionRangeOptions): com.google.protobuf.descriptor.ExtensionRangeOptions = com.google.protobuf.descriptor.ExtensionRangeOptions( uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = { - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ExtensionRangeOptions( - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ExtensionRangeOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl lazy val defaultInstance = com.google.protobuf.descriptor.ExtensionRangeOptions( uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ExtensionRangeOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ExtensionRangeOptions = { + com.google.protobuf.descriptor.ExtensionRangeOptions( + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions, com.google.protobuf.descriptor.ExtensionRangeOptions.Builder] { + def apply(): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ExtensionRangeOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ExtensionRangeOptions): Builder = com.google.protobuf.descriptor.ExtensionRangeOptions.Builder(a) implicit class ExtensionRangeOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ExtensionRangeOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ExtensionRangeOptions](_l) { def uninterpretedOption: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]] = field(_.uninterpretedOption)((c_, f_) => c_.copy(uninterpretedOption = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala index 5a27a4f18..e2bdf28d0 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala @@ -241,64 +241,7 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google jsonName = if (javaPbSource.hasJsonName) Some(javaPbSource.getJsonName) else _root_.scala.None, options = if (javaPbSource.hasOptions) Some(com.google.protobuf.descriptor.FieldOptions.fromJavaProto(javaPbSource.getOptions)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = { - var __name = `_message__`.name - var __number = `_message__`.number - var __label = `_message__`.label - var __type = `_message__`.`type` - var __typeName = `_message__`.typeName - var __extendee = `_message__`.extendee - var __defaultValue = `_message__`.defaultValue - var __oneofIndex = `_message__`.oneofIndex - var __jsonName = `_message__`.jsonName - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 24 => - __number = Option(_input__.readInt32()) - case 32 => - __label = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Label.fromValue(_input__.readEnum())) - case 40 => - __type = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Type.fromValue(_input__.readEnum())) - case 50 => - __typeName = Option(_input__.readStringRequireUtf8()) - case 18 => - __extendee = Option(_input__.readStringRequireUtf8()) - case 58 => - __defaultValue = Option(_input__.readStringRequireUtf8()) - case 72 => - __oneofIndex = Option(_input__.readInt32()) - case 82 => - __jsonName = Option(_input__.readStringRequireUtf8()) - case 66 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FieldDescriptorProto( - name = __name, - number = __number, - label = __label, - `type` = __type, - typeName = __typeName, - extendee = __extendee, - defaultValue = __defaultValue, - oneofIndex = __oneofIndex, - jsonName = __jsonName, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -344,6 +287,100 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google jsonName = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __number: _root_.scala.Option[_root_.scala.Int], + private var __label: _root_.scala.Option[com.google.protobuf.descriptor.FieldDescriptorProto.Label], + private var __type: _root_.scala.Option[com.google.protobuf.descriptor.FieldDescriptorProto.Type], + private var __typeName: _root_.scala.Option[_root_.scala.Predef.String], + private var __extendee: _root_.scala.Option[_root_.scala.Predef.String], + private var __defaultValue: _root_.scala.Option[_root_.scala.Predef.String], + private var __oneofIndex: _root_.scala.Option[_root_.scala.Int], + private var __jsonName: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 24 => + __number = Option(_input__.readInt32()) + case 32 => + __label = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Label.fromValue(_input__.readEnum())) + case 40 => + __type = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Type.fromValue(_input__.readEnum())) + case 50 => + __typeName = Option(_input__.readStringRequireUtf8()) + case 18 => + __extendee = Option(_input__.readStringRequireUtf8()) + case 58 => + __defaultValue = Option(_input__.readStringRequireUtf8()) + case 72 => + __oneofIndex = Option(_input__.readInt32()) + case 82 => + __jsonName = Option(_input__.readStringRequireUtf8()) + case 66 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FieldDescriptorProto = { + com.google.protobuf.descriptor.FieldDescriptorProto( + name = __name, + number = __number, + label = __label, + `type` = __type, + typeName = __typeName, + extendee = __extendee, + defaultValue = __defaultValue, + oneofIndex = __oneofIndex, + jsonName = __jsonName, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FieldDescriptorProto, com.google.protobuf.descriptor.FieldDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __number = _root_.scala.None, + __label = _root_.scala.None, + __type = _root_.scala.None, + __typeName = _root_.scala.None, + __extendee = _root_.scala.None, + __defaultValue = _root_.scala.None, + __oneofIndex = _root_.scala.None, + __jsonName = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __label = _message__.label, + __type = _message__.`type`, + __typeName = _message__.typeName, + __extendee = _message__.extendee, + __defaultValue = _message__.defaultValue, + __oneofIndex = _message__.oneofIndex, + __jsonName = _message__.jsonName, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FieldDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FieldDescriptorProto): Builder = com.google.protobuf.descriptor.FieldDescriptorProto.Builder(a) sealed abstract class Type(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = Type def isTypeDouble: _root_.scala.Boolean = false diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala index 3daee464d..495769668 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala @@ -228,52 +228,7 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu weak = if (javaPbSource.hasWeak) Some(javaPbSource.getWeak.booleanValue) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = { - var __ctype = `_message__`.ctype - var __packed = `_message__`.packed - var __jstype = `_message__`.jstype - var __lazy = `_message__`.`lazy` - var __deprecated = `_message__`.deprecated - var __weak = `_message__`.weak - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __ctype = Option(com.google.protobuf.descriptor.FieldOptions.CType.fromValue(_input__.readEnum())) - case 16 => - __packed = Option(_input__.readBool()) - case 48 => - __jstype = Option(com.google.protobuf.descriptor.FieldOptions.JSType.fromValue(_input__.readEnum())) - case 40 => - __lazy = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 80 => - __weak = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FieldOptions( - ctype = __ctype, - packed = __packed, - jstype = __jstype, - `lazy` = __lazy, - deprecated = __deprecated, - weak = __weak, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -313,6 +268,82 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu weak = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __ctype: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions.CType], + private var __packed: _root_.scala.Option[_root_.scala.Boolean], + private var __jstype: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions.JSType], + private var __lazy: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __weak: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FieldOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __ctype = Option(com.google.protobuf.descriptor.FieldOptions.CType.fromValue(_input__.readEnum())) + case 16 => + __packed = Option(_input__.readBool()) + case 48 => + __jstype = Option(com.google.protobuf.descriptor.FieldOptions.JSType.fromValue(_input__.readEnum())) + case 40 => + __lazy = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 80 => + __weak = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FieldOptions = { + com.google.protobuf.descriptor.FieldOptions( + ctype = __ctype, + packed = __packed, + jstype = __jstype, + `lazy` = __lazy, + deprecated = __deprecated, + weak = __weak, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FieldOptions, com.google.protobuf.descriptor.FieldOptions.Builder] { + def apply(): Builder = new Builder( + __ctype = _root_.scala.None, + __packed = _root_.scala.None, + __jstype = _root_.scala.None, + __lazy = _root_.scala.None, + __deprecated = _root_.scala.None, + __weak = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FieldOptions): Builder = new Builder( + __ctype = _message__.ctype, + __packed = _message__.packed, + __jstype = _message__.jstype, + __lazy = _message__.`lazy`, + __deprecated = _message__.deprecated, + __weak = _message__.weak, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FieldOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FieldOptions): Builder = com.google.protobuf.descriptor.FieldOptions.Builder(a) sealed abstract class CType(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = CType def isString: _root_.scala.Boolean = false diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala index 92873f922..303d50c8f 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala @@ -286,88 +286,7 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. sourceCodeInfo = if (javaPbSource.hasSourceCodeInfo) Some(com.google.protobuf.descriptor.SourceCodeInfo.fromJavaProto(javaPbSource.getSourceCodeInfo)) else _root_.scala.None, syntax = if (javaPbSource.hasSyntax) Some(javaPbSource.getSyntax) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = { - var __name = `_message__`.name - var __package = `_message__`.`package` - val __dependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.dependency) - val __publicDependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.publicDependency) - val __weakDependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.weakDependency) - val __messageType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= `_message__`.messageType) - val __enumType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= `_message__`.enumType) - val __service = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] ++= `_message__`.service) - val __extension = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.extension) - var __options = `_message__`.options - var __sourceCodeInfo = `_message__`.sourceCodeInfo - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __package = Option(_input__.readStringRequireUtf8()) - case 26 => - __dependency += _input__.readStringRequireUtf8() - case 80 => - __publicDependency += _input__.readInt32() - case 82 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __publicDependency += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 88 => - __weakDependency += _input__.readInt32() - case 90 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __weakDependency += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 34 => - __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) - case 42 => - __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) - case 50 => - __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance) - case 58 => - __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 66 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance))) - case 74 => - __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance))) - case 98 => - __syntax = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileDescriptorProto( - name = __name, - `package` = __package, - dependency = __dependency.result(), - publicDependency = __publicDependency.result(), - weakDependency = __weakDependency.result(), - messageType = __messageType.result(), - enumType = __enumType.result(), - service = __service.result(), - extension = __extension.result(), - options = __options, - sourceCodeInfo = __sourceCodeInfo, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -417,6 +336,128 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. sourceCodeInfo = _root_.scala.None, syntax = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __package: _root_.scala.Option[_root_.scala.Predef.String], + private var __dependency: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __publicDependency: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __weakDependency: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __messageType: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto]], + private var __enumType: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto]], + private var __service: collection.mutable.Builder[com.google.protobuf.descriptor.ServiceDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.ServiceDescriptorProto]], + private var __extension: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.FileOptions], + private var __sourceCodeInfo: _root_.scala.Option[com.google.protobuf.descriptor.SourceCodeInfo], + private var __syntax: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __package = Option(_input__.readStringRequireUtf8()) + case 26 => + __dependency += _input__.readStringRequireUtf8() + case 80 => + __publicDependency += _input__.readInt32() + case 82 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __publicDependency += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 88 => + __weakDependency += _input__.readInt32() + case 90 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __weakDependency += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 34 => + __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) + case 42 => + __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) + case 50 => + __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance) + case 58 => + __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 66 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance))) + case 74 => + __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance))) + case 98 => + __syntax = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileDescriptorProto = { + com.google.protobuf.descriptor.FileDescriptorProto( + name = __name, + `package` = __package, + dependency = __dependency.result(), + publicDependency = __publicDependency.result(), + weakDependency = __weakDependency.result(), + messageType = __messageType.result(), + enumType = __enumType.result(), + service = __service.result(), + extension = __extension.result(), + options = __options, + sourceCodeInfo = __sourceCodeInfo, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileDescriptorProto, com.google.protobuf.descriptor.FileDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __package = _root_.scala.None, + __dependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __publicDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __weakDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __messageType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto], + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto], + __service = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto], + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __options = _root_.scala.None, + __sourceCodeInfo = _root_.scala.None, + __syntax = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto): Builder = new Builder( + __name = _message__.name, + __package = _message__.`package`, + __dependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.dependency, + __publicDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.publicDependency, + __weakDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.weakDependency, + __messageType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= _message__.messageType, + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= _message__.enumType, + __service = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] ++= _message__.service, + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.extension, + __options = _message__.options, + __sourceCodeInfo = _message__.sourceCodeInfo, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileDescriptorProto): Builder = com.google.protobuf.descriptor.FileDescriptorProto.Builder(a) implicit class FileDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.FileDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.FileDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala index 709f6c9cd..66c472ad8 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala @@ -73,28 +73,7 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr def fromJavaProto(javaPbSource: com.google.protobuf.DescriptorProtos.FileDescriptorSet): com.google.protobuf.descriptor.FileDescriptorSet = com.google.protobuf.descriptor.FileDescriptorSet( file = javaPbSource.getFileList.asScala.iterator.map(com.google.protobuf.descriptor.FileDescriptorProto.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = { - val __file = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= `_message__`.file) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileDescriptorSet( - file = __file.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorSet] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr lazy val defaultInstance = com.google.protobuf.descriptor.FileDescriptorSet( file = _root_.scala.Seq.empty ) + final class Builder private ( + private var __file: collection.mutable.Builder[com.google.protobuf.descriptor.FileDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileDescriptorSet] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileDescriptorSet = { + com.google.protobuf.descriptor.FileDescriptorSet( + file = __file.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileDescriptorSet, com.google.protobuf.descriptor.FileDescriptorSet.Builder] { + def apply(): Builder = new Builder( + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet): Builder = new Builder( + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= _message__.file, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileDescriptorSet.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileDescriptorSet): Builder = com.google.protobuf.descriptor.FileDescriptorSet.Builder(a) implicit class FileDescriptorSetLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.FileDescriptorSet]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.FileDescriptorSet](_l) { def file: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]] = field(_.file)((c_, f_) => c_.copy(file = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala index 0353e4729..3af9d817c 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala @@ -471,108 +471,7 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf rubyPackage = if (javaPbSource.hasRubyPackage) Some(javaPbSource.getRubyPackage) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.FileOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = { - var __javaPackage = `_message__`.javaPackage - var __javaOuterClassname = `_message__`.javaOuterClassname - var __javaMultipleFiles = `_message__`.javaMultipleFiles - var __javaGenerateEqualsAndHash = `_message__`.javaGenerateEqualsAndHash - var __javaStringCheckUtf8 = `_message__`.javaStringCheckUtf8 - var __optimizeFor = `_message__`.optimizeFor - var __goPackage = `_message__`.goPackage - var __ccGenericServices = `_message__`.ccGenericServices - var __javaGenericServices = `_message__`.javaGenericServices - var __pyGenericServices = `_message__`.pyGenericServices - var __phpGenericServices = `_message__`.phpGenericServices - var __deprecated = `_message__`.deprecated - var __ccEnableArenas = `_message__`.ccEnableArenas - var __objcClassPrefix = `_message__`.objcClassPrefix - var __csharpNamespace = `_message__`.csharpNamespace - var __swiftPrefix = `_message__`.swiftPrefix - var __phpClassPrefix = `_message__`.phpClassPrefix - var __phpNamespace = `_message__`.phpNamespace - var __phpMetadataNamespace = `_message__`.phpMetadataNamespace - var __rubyPackage = `_message__`.rubyPackage - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __javaPackage = Option(_input__.readStringRequireUtf8()) - case 66 => - __javaOuterClassname = Option(_input__.readStringRequireUtf8()) - case 80 => - __javaMultipleFiles = Option(_input__.readBool()) - case 160 => - __javaGenerateEqualsAndHash = Option(_input__.readBool()) - case 216 => - __javaStringCheckUtf8 = Option(_input__.readBool()) - case 72 => - __optimizeFor = Option(com.google.protobuf.descriptor.FileOptions.OptimizeMode.fromValue(_input__.readEnum())) - case 90 => - __goPackage = Option(_input__.readStringRequireUtf8()) - case 128 => - __ccGenericServices = Option(_input__.readBool()) - case 136 => - __javaGenericServices = Option(_input__.readBool()) - case 144 => - __pyGenericServices = Option(_input__.readBool()) - case 336 => - __phpGenericServices = Option(_input__.readBool()) - case 184 => - __deprecated = Option(_input__.readBool()) - case 248 => - __ccEnableArenas = Option(_input__.readBool()) - case 290 => - __objcClassPrefix = Option(_input__.readStringRequireUtf8()) - case 298 => - __csharpNamespace = Option(_input__.readStringRequireUtf8()) - case 314 => - __swiftPrefix = Option(_input__.readStringRequireUtf8()) - case 322 => - __phpClassPrefix = Option(_input__.readStringRequireUtf8()) - case 330 => - __phpNamespace = Option(_input__.readStringRequireUtf8()) - case 354 => - __phpMetadataNamespace = Option(_input__.readStringRequireUtf8()) - case 362 => - __rubyPackage = Option(_input__.readStringRequireUtf8()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileOptions( - javaPackage = __javaPackage, - javaOuterClassname = __javaOuterClassname, - javaMultipleFiles = __javaMultipleFiles, - javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash, - javaStringCheckUtf8 = __javaStringCheckUtf8, - optimizeFor = __optimizeFor, - goPackage = __goPackage, - ccGenericServices = __ccGenericServices, - javaGenericServices = __javaGenericServices, - pyGenericServices = __pyGenericServices, - phpGenericServices = __phpGenericServices, - deprecated = __deprecated, - ccEnableArenas = __ccEnableArenas, - objcClassPrefix = __objcClassPrefix, - csharpNamespace = __csharpNamespace, - swiftPrefix = __swiftPrefix, - phpClassPrefix = __phpClassPrefix, - phpNamespace = __phpNamespace, - phpMetadataNamespace = __phpMetadataNamespace, - rubyPackage = __rubyPackage, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -639,6 +538,166 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf rubyPackage = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __javaPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __javaOuterClassname: _root_.scala.Option[_root_.scala.Predef.String], + private var __javaMultipleFiles: _root_.scala.Option[_root_.scala.Boolean], + private var __javaGenerateEqualsAndHash: _root_.scala.Option[_root_.scala.Boolean], + private var __javaStringCheckUtf8: _root_.scala.Option[_root_.scala.Boolean], + private var __optimizeFor: _root_.scala.Option[com.google.protobuf.descriptor.FileOptions.OptimizeMode], + private var __goPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __ccGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __javaGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __pyGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __phpGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __ccEnableArenas: _root_.scala.Option[_root_.scala.Boolean], + private var __objcClassPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __csharpNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __swiftPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpClassPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpMetadataNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __rubyPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __javaPackage = Option(_input__.readStringRequireUtf8()) + case 66 => + __javaOuterClassname = Option(_input__.readStringRequireUtf8()) + case 80 => + __javaMultipleFiles = Option(_input__.readBool()) + case 160 => + __javaGenerateEqualsAndHash = Option(_input__.readBool()) + case 216 => + __javaStringCheckUtf8 = Option(_input__.readBool()) + case 72 => + __optimizeFor = Option(com.google.protobuf.descriptor.FileOptions.OptimizeMode.fromValue(_input__.readEnum())) + case 90 => + __goPackage = Option(_input__.readStringRequireUtf8()) + case 128 => + __ccGenericServices = Option(_input__.readBool()) + case 136 => + __javaGenericServices = Option(_input__.readBool()) + case 144 => + __pyGenericServices = Option(_input__.readBool()) + case 336 => + __phpGenericServices = Option(_input__.readBool()) + case 184 => + __deprecated = Option(_input__.readBool()) + case 248 => + __ccEnableArenas = Option(_input__.readBool()) + case 290 => + __objcClassPrefix = Option(_input__.readStringRequireUtf8()) + case 298 => + __csharpNamespace = Option(_input__.readStringRequireUtf8()) + case 314 => + __swiftPrefix = Option(_input__.readStringRequireUtf8()) + case 322 => + __phpClassPrefix = Option(_input__.readStringRequireUtf8()) + case 330 => + __phpNamespace = Option(_input__.readStringRequireUtf8()) + case 354 => + __phpMetadataNamespace = Option(_input__.readStringRequireUtf8()) + case 362 => + __rubyPackage = Option(_input__.readStringRequireUtf8()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileOptions = { + com.google.protobuf.descriptor.FileOptions( + javaPackage = __javaPackage, + javaOuterClassname = __javaOuterClassname, + javaMultipleFiles = __javaMultipleFiles, + javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash, + javaStringCheckUtf8 = __javaStringCheckUtf8, + optimizeFor = __optimizeFor, + goPackage = __goPackage, + ccGenericServices = __ccGenericServices, + javaGenericServices = __javaGenericServices, + pyGenericServices = __pyGenericServices, + phpGenericServices = __phpGenericServices, + deprecated = __deprecated, + ccEnableArenas = __ccEnableArenas, + objcClassPrefix = __objcClassPrefix, + csharpNamespace = __csharpNamespace, + swiftPrefix = __swiftPrefix, + phpClassPrefix = __phpClassPrefix, + phpNamespace = __phpNamespace, + phpMetadataNamespace = __phpMetadataNamespace, + rubyPackage = __rubyPackage, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileOptions, com.google.protobuf.descriptor.FileOptions.Builder] { + def apply(): Builder = new Builder( + __javaPackage = _root_.scala.None, + __javaOuterClassname = _root_.scala.None, + __javaMultipleFiles = _root_.scala.None, + __javaGenerateEqualsAndHash = _root_.scala.None, + __javaStringCheckUtf8 = _root_.scala.None, + __optimizeFor = _root_.scala.None, + __goPackage = _root_.scala.None, + __ccGenericServices = _root_.scala.None, + __javaGenericServices = _root_.scala.None, + __pyGenericServices = _root_.scala.None, + __phpGenericServices = _root_.scala.None, + __deprecated = _root_.scala.None, + __ccEnableArenas = _root_.scala.None, + __objcClassPrefix = _root_.scala.None, + __csharpNamespace = _root_.scala.None, + __swiftPrefix = _root_.scala.None, + __phpClassPrefix = _root_.scala.None, + __phpNamespace = _root_.scala.None, + __phpMetadataNamespace = _root_.scala.None, + __rubyPackage = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileOptions): Builder = new Builder( + __javaPackage = _message__.javaPackage, + __javaOuterClassname = _message__.javaOuterClassname, + __javaMultipleFiles = _message__.javaMultipleFiles, + __javaGenerateEqualsAndHash = _message__.javaGenerateEqualsAndHash, + __javaStringCheckUtf8 = _message__.javaStringCheckUtf8, + __optimizeFor = _message__.optimizeFor, + __goPackage = _message__.goPackage, + __ccGenericServices = _message__.ccGenericServices, + __javaGenericServices = _message__.javaGenericServices, + __pyGenericServices = _message__.pyGenericServices, + __phpGenericServices = _message__.phpGenericServices, + __deprecated = _message__.deprecated, + __ccEnableArenas = _message__.ccEnableArenas, + __objcClassPrefix = _message__.objcClassPrefix, + __csharpNamespace = _message__.csharpNamespace, + __swiftPrefix = _message__.swiftPrefix, + __phpClassPrefix = _message__.phpClassPrefix, + __phpNamespace = _message__.phpNamespace, + __phpMetadataNamespace = _message__.phpMetadataNamespace, + __rubyPackage = _message__.rubyPackage, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileOptions): Builder = com.google.protobuf.descriptor.FileOptions.Builder(a) /** Generated classes can be optimized for speed or code size. */ sealed abstract class OptimizeMode(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala index 828d098b5..6516445b7 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala @@ -78,28 +78,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr def fromJavaProto(javaPbSource: com.google.protobuf.DescriptorProtos.GeneratedCodeInfo): com.google.protobuf.descriptor.GeneratedCodeInfo = com.google.protobuf.descriptor.GeneratedCodeInfo( annotation = javaPbSource.getAnnotationList.asScala.iterator.map(com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = { - val __annotation = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] ++= `_message__`.annotation) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.GeneratedCodeInfo( - annotation = __annotation.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -125,6 +104,46 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr lazy val defaultInstance = com.google.protobuf.descriptor.GeneratedCodeInfo( annotation = _root_.scala.Seq.empty ) + final class Builder private ( + private var __annotation: collection.mutable.Builder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, _root_.scala.Seq[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.GeneratedCodeInfo = { + com.google.protobuf.descriptor.GeneratedCodeInfo( + annotation = __annotation.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo, com.google.protobuf.descriptor.GeneratedCodeInfo.Builder] { + def apply(): Builder = new Builder( + __annotation = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo): Builder = new Builder( + __annotation = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] ++= _message__.annotation, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Builder() + def newBuilder(a: com.google.protobuf.descriptor.GeneratedCodeInfo): Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Builder(a) /** @param path * Identifies the element in the original source .proto file. This field * is formatted the same as SourceCodeInfo.Location.path. @@ -258,48 +277,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr begin = if (javaPbSource.hasBegin) Some(javaPbSource.getBegin.intValue) else _root_.scala.None, end = if (javaPbSource.hasEnd) Some(javaPbSource.getEnd.intValue) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = { - val __path = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.path) - var __sourceFile = `_message__`.sourceFile - var __begin = `_message__`.begin - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __path += _input__.readInt32() - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __path += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 18 => - __sourceFile = Option(_input__.readStringRequireUtf8()) - case 24 => - __begin = Option(_input__.readInt32()) - case 32 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation( - path = __path.result(), - sourceFile = __sourceFile, - begin = __begin, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -322,6 +300,72 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr begin = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __path: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __sourceFile: _root_.scala.Option[_root_.scala.Predef.String], + private var __begin: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __path += _input__.readInt32() + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __path += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 18 => + __sourceFile = Option(_input__.readStringRequireUtf8()) + case 24 => + __begin = Option(_input__.readInt32()) + case 32 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = { + com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation( + path = __path.result(), + sourceFile = __sourceFile, + begin = __begin, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder] { + def apply(): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __sourceFile = _root_.scala.None, + __begin = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.path, + __sourceFile = _message__.sourceFile, + __begin = _message__.begin, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder() + def newBuilder(a: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation): Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder(a) implicit class AnnotationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation](_l) { def path: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.path)((c_, f_) => c_.copy(path = f_)) def sourceFile: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getSourceFile)((c_, f_) => c_.copy(sourceFile = Option(f_))) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala index c0f48f232..5d80b7859 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala @@ -187,44 +187,7 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto mapEntry = if (javaPbSource.hasMapEntry) Some(javaPbSource.getMapEntry.booleanValue) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = { - var __messageSetWireFormat = `_message__`.messageSetWireFormat - var __noStandardDescriptorAccessor = `_message__`.noStandardDescriptorAccessor - var __deprecated = `_message__`.deprecated - var __mapEntry = `_message__`.mapEntry - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __messageSetWireFormat = Option(_input__.readBool()) - case 16 => - __noStandardDescriptorAccessor = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 56 => - __mapEntry = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MessageOptions( - messageSetWireFormat = __messageSetWireFormat, - noStandardDescriptorAccessor = __noStandardDescriptorAccessor, - deprecated = __deprecated, - mapEntry = __mapEntry, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MessageOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -255,6 +218,70 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto mapEntry = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __messageSetWireFormat: _root_.scala.Option[_root_.scala.Boolean], + private var __noStandardDescriptorAccessor: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __mapEntry: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MessageOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __messageSetWireFormat = Option(_input__.readBool()) + case 16 => + __noStandardDescriptorAccessor = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 56 => + __mapEntry = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MessageOptions = { + com.google.protobuf.descriptor.MessageOptions( + messageSetWireFormat = __messageSetWireFormat, + noStandardDescriptorAccessor = __noStandardDescriptorAccessor, + deprecated = __deprecated, + mapEntry = __mapEntry, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MessageOptions, com.google.protobuf.descriptor.MessageOptions.Builder] { + def apply(): Builder = new Builder( + __messageSetWireFormat = _root_.scala.None, + __noStandardDescriptorAccessor = _root_.scala.None, + __deprecated = _root_.scala.None, + __mapEntry = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MessageOptions): Builder = new Builder( + __messageSetWireFormat = _message__.messageSetWireFormat, + __noStandardDescriptorAccessor = _message__.noStandardDescriptorAccessor, + __deprecated = _message__.deprecated, + __mapEntry = _message__.mapEntry, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MessageOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MessageOptions): Builder = com.google.protobuf.descriptor.MessageOptions.Builder(a) implicit class MessageOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.MessageOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.MessageOptions](_l) { def messageSetWireFormat: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getMessageSetWireFormat)((c_, f_) => c_.copy(messageSetWireFormat = Option(f_))) def optionalMessageSetWireFormat: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.messageSetWireFormat)((c_, f_) => c_.copy(messageSetWireFormat = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala index ffe70ece6..4bce4fac7 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala @@ -158,48 +158,7 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl clientStreaming = if (javaPbSource.hasClientStreaming) Some(javaPbSource.getClientStreaming.booleanValue) else _root_.scala.None, serverStreaming = if (javaPbSource.hasServerStreaming) Some(javaPbSource.getServerStreaming.booleanValue) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = { - var __name = `_message__`.name - var __inputType = `_message__`.inputType - var __outputType = `_message__`.outputType - var __options = `_message__`.options - var __clientStreaming = `_message__`.clientStreaming - var __serverStreaming = `_message__`.serverStreaming - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __inputType = Option(_input__.readStringRequireUtf8()) - case 26 => - __outputType = Option(_input__.readStringRequireUtf8()) - case 34 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance))) - case 40 => - __clientStreaming = Option(_input__.readBool()) - case 48 => - __serverStreaming = Option(_input__.readBool()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MethodDescriptorProto( - name = __name, - inputType = __inputType, - outputType = __outputType, - options = __options, - clientStreaming = __clientStreaming, - serverStreaming = __serverStreaming, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -232,6 +191,76 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl clientStreaming = _root_.scala.None, serverStreaming = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __inputType: _root_.scala.Option[_root_.scala.Predef.String], + private var __outputType: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.MethodOptions], + private var __clientStreaming: _root_.scala.Option[_root_.scala.Boolean], + private var __serverStreaming: _root_.scala.Option[_root_.scala.Boolean], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __inputType = Option(_input__.readStringRequireUtf8()) + case 26 => + __outputType = Option(_input__.readStringRequireUtf8()) + case 34 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance))) + case 40 => + __clientStreaming = Option(_input__.readBool()) + case 48 => + __serverStreaming = Option(_input__.readBool()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MethodDescriptorProto = { + com.google.protobuf.descriptor.MethodDescriptorProto( + name = __name, + inputType = __inputType, + outputType = __outputType, + options = __options, + clientStreaming = __clientStreaming, + serverStreaming = __serverStreaming, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MethodDescriptorProto, com.google.protobuf.descriptor.MethodDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __inputType = _root_.scala.None, + __outputType = _root_.scala.None, + __options = _root_.scala.None, + __clientStreaming = _root_.scala.None, + __serverStreaming = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto): Builder = new Builder( + __name = _message__.name, + __inputType = _message__.inputType, + __outputType = _message__.outputType, + __options = _message__.options, + __clientStreaming = _message__.clientStreaming, + __serverStreaming = _message__.serverStreaming, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MethodDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MethodDescriptorProto): Builder = com.google.protobuf.descriptor.MethodDescriptorProto.Builder(a) implicit class MethodDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.MethodDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.MethodDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala index 18a0209e3..c727d055d 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala @@ -110,36 +110,7 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob idempotencyLevel = if (javaPbSource.hasIdempotencyLevel) Some(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromJavaValue(javaPbSource.getIdempotencyLevel)) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.MethodOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = { - var __deprecated = `_message__`.deprecated - var __idempotencyLevel = `_message__`.idempotencyLevel - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 264 => - __deprecated = Option(_input__.readBool()) - case 272 => - __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum())) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MethodOptions( - deprecated = __deprecated, - idempotencyLevel = __idempotencyLevel, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MethodOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -170,6 +141,58 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob idempotencyLevel = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __idempotencyLevel: _root_.scala.Option[com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MethodOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 264 => + __deprecated = Option(_input__.readBool()) + case 272 => + __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum())) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MethodOptions = { + com.google.protobuf.descriptor.MethodOptions( + deprecated = __deprecated, + idempotencyLevel = __idempotencyLevel, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MethodOptions, com.google.protobuf.descriptor.MethodOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __idempotencyLevel = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MethodOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __idempotencyLevel = _message__.idempotencyLevel, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MethodOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MethodOptions): Builder = com.google.protobuf.descriptor.MethodOptions.Builder(a) /** Is this method side-effect-free (or safe in HTTP parlance), or idempotent, * or neither? HTTP based RPC implementation may choose GET verb for safe * methods, and PUT verb for idempotent methods instead of the default POST. diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala index acf0441c2..c72139fe4 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala @@ -86,32 +86,7 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google name = if (javaPbSource.hasName) Some(javaPbSource.getName) else _root_.scala.None, options = if (javaPbSource.hasOptions) Some(com.google.protobuf.descriptor.OneofOptions.fromJavaProto(javaPbSource.getOptions)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = { - var __name = `_message__`.name - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.OneofDescriptorProto( - name = __name, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -136,6 +111,52 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google name = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.OneofOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.OneofDescriptorProto = { + com.google.protobuf.descriptor.OneofDescriptorProto( + name = __name, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.OneofDescriptorProto, com.google.protobuf.descriptor.OneofDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto): Builder = new Builder( + __name = _message__.name, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.OneofDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.OneofDescriptorProto): Builder = com.google.protobuf.descriptor.OneofDescriptorProto.Builder(a) implicit class OneofDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.OneofDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.OneofDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala index faab353ca..d11d92ee9 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala @@ -73,28 +73,7 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu def fromJavaProto(javaPbSource: com.google.protobuf.DescriptorProtos.OneofOptions): com.google.protobuf.descriptor.OneofOptions = com.google.protobuf.descriptor.OneofOptions( uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = { - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.OneofOptions( - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu lazy val defaultInstance = com.google.protobuf.descriptor.OneofOptions( uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.OneofOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.OneofOptions = { + com.google.protobuf.descriptor.OneofOptions( + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.OneofOptions, com.google.protobuf.descriptor.OneofOptions.Builder] { + def apply(): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.OneofOptions): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.OneofOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.OneofOptions): Builder = com.google.protobuf.descriptor.OneofOptions.Builder(a) implicit class OneofOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.OneofOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.OneofOptions](_l) { def uninterpretedOption: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]] = field(_.uninterpretedOption)((c_, f_) => c_.copy(uninterpretedOption = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala index 6d4b22526..249508100 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala @@ -106,36 +106,7 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog method = javaPbSource.getMethodList.asScala.iterator.map(com.google.protobuf.descriptor.MethodDescriptorProto.fromJavaProto).toSeq, options = if (javaPbSource.hasOptions) Some(com.google.protobuf.descriptor.ServiceOptions.fromJavaProto(javaPbSource.getOptions)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = { - var __name = `_message__`.name - val __method = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] ++= `_message__`.method) - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ServiceDescriptorProto( - name = __name, - method = __method.result(), - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -163,6 +134,58 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog method = _root_.scala.Seq.empty, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __method: collection.mutable.Builder[com.google.protobuf.descriptor.MethodDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.MethodDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.ServiceOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ServiceDescriptorProto = { + com.google.protobuf.descriptor.ServiceDescriptorProto( + name = __name, + method = __method.result(), + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto, com.google.protobuf.descriptor.ServiceDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __method = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto], + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto): Builder = new Builder( + __name = _message__.name, + __method = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] ++= _message__.method, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ServiceDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ServiceDescriptorProto): Builder = com.google.protobuf.descriptor.ServiceDescriptorProto.Builder(a) implicit class ServiceDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ServiceDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ServiceDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala index 47d50f55f..5cd7efa6d 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala @@ -94,32 +94,7 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto deprecated = if (javaPbSource.hasDeprecated) Some(javaPbSource.getDeprecated.booleanValue) else _root_.scala.None, uninterpretedOption = javaPbSource.getUninterpretedOptionList.asScala.iterator.map(com.google.protobuf.descriptor.UninterpretedOption.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.ServiceOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = { - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 264 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ServiceOptions( - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ServiceOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -144,6 +119,52 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ServiceOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 264 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ServiceOptions = { + com.google.protobuf.descriptor.ServiceOptions( + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ServiceOptions, com.google.protobuf.descriptor.ServiceOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ServiceOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ServiceOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ServiceOptions): Builder = com.google.protobuf.descriptor.ServiceOptions.Builder(a) implicit class ServiceOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ServiceOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ServiceOptions](_l) { def deprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getDeprecated)((c_, f_) => c_.copy(deprecated = Option(f_))) def optionalDeprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.deprecated)((c_, f_) => c_.copy(deprecated = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala index ba29bc3b4..35fb8b3ba 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala @@ -118,28 +118,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto def fromJavaProto(javaPbSource: com.google.protobuf.DescriptorProtos.SourceCodeInfo): com.google.protobuf.descriptor.SourceCodeInfo = com.google.protobuf.descriptor.SourceCodeInfo( location = javaPbSource.getLocationList.asScala.iterator.map(com.google.protobuf.descriptor.SourceCodeInfo.Location.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = { - val __location = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] ++= `_message__`.location) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.SourceCodeInfo( - location = __location.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -165,6 +144,46 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto lazy val defaultInstance = com.google.protobuf.descriptor.SourceCodeInfo( location = _root_.scala.Seq.empty ) + final class Builder private ( + private var __location: collection.mutable.Builder[com.google.protobuf.descriptor.SourceCodeInfo.Location, _root_.scala.Seq[com.google.protobuf.descriptor.SourceCodeInfo.Location]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.SourceCodeInfo] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.SourceCodeInfo = { + com.google.protobuf.descriptor.SourceCodeInfo( + location = __location.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.SourceCodeInfo, com.google.protobuf.descriptor.SourceCodeInfo.Builder] { + def apply(): Builder = new Builder( + __location = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo): Builder = new Builder( + __location = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] ++= _message__.location, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.SourceCodeInfo.Builder() + def newBuilder(a: com.google.protobuf.descriptor.SourceCodeInfo): Builder = com.google.protobuf.descriptor.SourceCodeInfo.Builder(a) /** @param path * Identifies which part of the FileDescriptorProto was defined at this * location. @@ -392,60 +411,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto trailingComments = if (javaPbSource.hasTrailingComments) Some(javaPbSource.getTrailingComments) else _root_.scala.None, leadingDetachedComments = javaPbSource.getLeadingDetachedCommentsList.asScala.iterator.map(_root_.scala.Predef.identity).toSeq ) - def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = { - val __path = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.path) - val __span = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.span) - var __leadingComments = `_message__`.leadingComments - var __trailingComments = `_message__`.trailingComments - val __leadingDetachedComments = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.leadingDetachedComments) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __path += _input__.readInt32() - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __path += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 16 => - __span += _input__.readInt32() - case 18 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __span += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 26 => - __leadingComments = Option(_input__.readStringRequireUtf8()) - case 34 => - __trailingComments = Option(_input__.readStringRequireUtf8()) - case 50 => - __leadingDetachedComments += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.SourceCodeInfo.Location( - path = __path.result(), - span = __span.result(), - leadingComments = __leadingComments, - trailingComments = __trailingComments, - leadingDetachedComments = __leadingDetachedComments.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo.Location] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -470,6 +436,86 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto trailingComments = _root_.scala.None, leadingDetachedComments = _root_.scala.Seq.empty ) + final class Builder private ( + private var __path: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __span: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __leadingComments: _root_.scala.Option[_root_.scala.Predef.String], + private var __trailingComments: _root_.scala.Option[_root_.scala.Predef.String], + private var __leadingDetachedComments: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __path += _input__.readInt32() + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __path += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 16 => + __span += _input__.readInt32() + case 18 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __span += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 26 => + __leadingComments = Option(_input__.readStringRequireUtf8()) + case 34 => + __trailingComments = Option(_input__.readStringRequireUtf8()) + case 50 => + __leadingDetachedComments += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.SourceCodeInfo.Location = { + com.google.protobuf.descriptor.SourceCodeInfo.Location( + path = __path.result(), + span = __span.result(), + leadingComments = __leadingComments, + trailingComments = __trailingComments, + leadingDetachedComments = __leadingDetachedComments.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location, com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder] { + def apply(): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __span = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __leadingComments = _root_.scala.None, + __trailingComments = _root_.scala.None, + __leadingDetachedComments = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.path, + __span = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.span, + __leadingComments = _message__.leadingComments, + __trailingComments = _message__.trailingComments, + __leadingDetachedComments = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.leadingDetachedComments, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder() + def newBuilder(a: com.google.protobuf.descriptor.SourceCodeInfo.Location): Builder = com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder(a) implicit class LocationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.SourceCodeInfo.Location]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.SourceCodeInfo.Location](_l) { def path: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.path)((c_, f_) => c_.copy(path = f_)) def span: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.span)((c_, f_) => c_.copy(span = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala index 068df7e00..139a8c5bb 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala @@ -177,52 +177,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. stringValue = if (javaPbSource.hasStringValue) Some(javaPbSource.getStringValue) else _root_.scala.None, aggregateValue = if (javaPbSource.hasAggregateValue) Some(javaPbSource.getAggregateValue) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = { - val __name = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] ++= `_message__`.name) - var __identifierValue = `_message__`.identifierValue - var __positiveIntValue = `_message__`.positiveIntValue - var __negativeIntValue = `_message__`.negativeIntValue - var __doubleValue = `_message__`.doubleValue - var __stringValue = `_message__`.stringValue - var __aggregateValue = `_message__`.aggregateValue - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 18 => - __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance) - case 26 => - __identifierValue = Option(_input__.readStringRequireUtf8()) - case 32 => - __positiveIntValue = Option(_input__.readUInt64()) - case 40 => - __negativeIntValue = Option(_input__.readInt64()) - case 49 => - __doubleValue = Option(_input__.readDouble()) - case 58 => - __stringValue = Option(_input__.readBytes()) - case 66 => - __aggregateValue = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.UninterpretedOption( - name = __name.result(), - identifierValue = __identifierValue, - positiveIntValue = __positiveIntValue, - negativeIntValue = __negativeIntValue, - doubleValue = __doubleValue, - stringValue = __stringValue, - aggregateValue = __aggregateValue, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -260,6 +215,82 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. stringValue = _root_.scala.None, aggregateValue = _root_.scala.None ) + final class Builder private ( + private var __name: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption.NamePart, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption.NamePart]], + private var __identifierValue: _root_.scala.Option[_root_.scala.Predef.String], + private var __positiveIntValue: _root_.scala.Option[_root_.scala.Long], + private var __negativeIntValue: _root_.scala.Option[_root_.scala.Long], + private var __doubleValue: _root_.scala.Option[_root_.scala.Double], + private var __stringValue: _root_.scala.Option[_root_.com.google.protobuf.ByteString], + private var __aggregateValue: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.UninterpretedOption] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 18 => + __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance) + case 26 => + __identifierValue = Option(_input__.readStringRequireUtf8()) + case 32 => + __positiveIntValue = Option(_input__.readUInt64()) + case 40 => + __negativeIntValue = Option(_input__.readInt64()) + case 49 => + __doubleValue = Option(_input__.readDouble()) + case 58 => + __stringValue = Option(_input__.readBytes()) + case 66 => + __aggregateValue = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.UninterpretedOption = { + com.google.protobuf.descriptor.UninterpretedOption( + name = __name.result(), + identifierValue = __identifierValue, + positiveIntValue = __positiveIntValue, + negativeIntValue = __negativeIntValue, + doubleValue = __doubleValue, + stringValue = __stringValue, + aggregateValue = __aggregateValue, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.UninterpretedOption, com.google.protobuf.descriptor.UninterpretedOption.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart], + __identifierValue = _root_.scala.None, + __positiveIntValue = _root_.scala.None, + __negativeIntValue = _root_.scala.None, + __doubleValue = _root_.scala.None, + __stringValue = _root_.scala.None, + __aggregateValue = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.UninterpretedOption): Builder = new Builder( + __name = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] ++= _message__.name, + __identifierValue = _message__.identifierValue, + __positiveIntValue = _message__.positiveIntValue, + __negativeIntValue = _message__.negativeIntValue, + __doubleValue = _message__.doubleValue, + __stringValue = _message__.stringValue, + __aggregateValue = _message__.aggregateValue, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.UninterpretedOption.Builder() + def newBuilder(a: com.google.protobuf.descriptor.UninterpretedOption): Builder = com.google.protobuf.descriptor.UninterpretedOption.Builder(a) /** The name of the uninterpreted option. Each string represents a segment in * a dot-separated name. is_extension is true iff a segment represents an * extension (denoted with parentheses in options specs in .proto files). @@ -343,36 +374,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. namePart = javaPbSource.getNamePart, isExtension = javaPbSource.getIsExtension.booleanValue ) - def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = { - var __namePart = `_message__`.namePart - var __isExtension = `_message__`.isExtension - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var __requiredFields0: _root_.scala.Long = 0x3L - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __namePart = _input__.readStringRequireUtf8() - __requiredFields0 &= 0xfffffffffffffffeL - case 16 => - __isExtension = _input__.readBool() - __requiredFields0 &= 0xfffffffffffffffdL - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } - com.google.protobuf.descriptor.UninterpretedOption.NamePart( - namePart = __namePart, - isExtension = __isExtension, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption.NamePart] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -391,6 +393,56 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. namePart = "", isExtension = false ) + final class Builder private ( + private var __namePart: _root_.scala.Predef.String, + private var __isExtension: _root_.scala.Boolean, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] { + private var __requiredFields0: _root_.scala.Long = 0x3L + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __namePart = _input__.readStringRequireUtf8() + __requiredFields0 &= 0xfffffffffffffffeL + case 16 => + __isExtension = _input__.readBool() + __requiredFields0 &= 0xfffffffffffffffdL + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.UninterpretedOption.NamePart = { + if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } + com.google.protobuf.descriptor.UninterpretedOption.NamePart( + namePart = __namePart, + isExtension = __isExtension, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart, com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder] { + def apply(): Builder = new Builder( + __namePart = "", + __isExtension = false, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart): Builder = new Builder( + __namePart = _message__.namePart, + __isExtension = _message__.isExtension, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder() + def newBuilder(a: com.google.protobuf.descriptor.UninterpretedOption.NamePart): Builder = com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder(a) implicit class NamePartLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.UninterpretedOption.NamePart]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.UninterpretedOption.NamePart](_l) { def namePart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.namePart)((c_, f_) => c_.copy(namePart = f_)) def isExtension: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.isExtension)((c_, f_) => c_.copy(isExtension = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala index 1fb121892..d9def7685 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/duration/Duration.scala @@ -165,32 +165,7 @@ object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.du seconds = javaPbSource.getSeconds.longValue, nanos = javaPbSource.getNanos.intValue ) - def merge(`_message__`: com.google.protobuf.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = { - var __seconds = `_message__`.seconds - var __nanos = `_message__`.nanos - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __seconds = _input__.readInt64() - case 16 => - __nanos = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.duration.Duration( - seconds = __seconds, - nanos = __nanos, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.duration.Duration] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -209,6 +184,52 @@ object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.du seconds = 0L, nanos = 0 ) + final class Builder private ( + private var __seconds: _root_.scala.Long, + private var __nanos: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.duration.Duration] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __seconds = _input__.readInt64() + case 16 => + __nanos = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.duration.Duration = { + com.google.protobuf.duration.Duration( + seconds = __seconds, + nanos = __nanos, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.duration.Duration, com.google.protobuf.duration.Duration.Builder] { + def apply(): Builder = new Builder( + __seconds = 0L, + __nanos = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.duration.Duration): Builder = new Builder( + __seconds = _message__.seconds, + __nanos = _message__.nanos, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.duration.Duration.Builder() + def newBuilder(a: com.google.protobuf.duration.Duration): Builder = com.google.protobuf.duration.Duration.Builder(a) implicit class DurationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.duration.Duration]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.duration.Duration](_l) { def seconds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.seconds)((c_, f_) => c_.copy(seconds = f_)) def nanos: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.nanos)((c_, f_) => c_.copy(nanos = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala index 62b556e13..1d8bf3053 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/empty/Empty.scala @@ -53,24 +53,7 @@ object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty } def fromJavaProto(javaPbSource: com.google.protobuf.Empty): com.google.protobuf.empty.Empty = com.google.protobuf.empty.Empty( ) - def merge(`_message__`: com.google.protobuf.empty.Empty, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = { - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.empty.Empty( - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.empty.Empty, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.empty.Empty] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -85,6 +68,40 @@ object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) lazy val defaultInstance = com.google.protobuf.empty.Empty( ) + final class Builder private ( + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.empty.Empty] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.empty.Empty = { + com.google.protobuf.empty.Empty( + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.empty.Empty, com.google.protobuf.empty.Empty.Builder] { + def apply(): Builder = new Builder( + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.empty.Empty): Builder = new Builder( + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.empty.Empty.Builder() + def newBuilder(a: com.google.protobuf.empty.Empty): Builder = com.google.protobuf.empty.Empty.Builder(a) implicit class EmptyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.empty.Empty]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.empty.Empty](_l) { } def of( diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala index 4396496cc..01dd1c3cd 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala @@ -271,28 +271,7 @@ object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.f def fromJavaProto(javaPbSource: com.google.protobuf.FieldMask): com.google.protobuf.field_mask.FieldMask = com.google.protobuf.field_mask.FieldMask( paths = javaPbSource.getPathsList.asScala.iterator.map(_root_.scala.Predef.identity).toSeq ) - def merge(`_message__`: com.google.protobuf.field_mask.FieldMask, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = { - val __paths = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.paths) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __paths += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.field_mask.FieldMask( - paths = __paths.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.field_mask.FieldMask, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.field_mask.FieldMask] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -309,6 +288,46 @@ object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.f lazy val defaultInstance = com.google.protobuf.field_mask.FieldMask( paths = _root_.scala.Seq.empty ) + final class Builder private ( + private var __paths: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.field_mask.FieldMask] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __paths += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.field_mask.FieldMask = { + com.google.protobuf.field_mask.FieldMask( + paths = __paths.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.field_mask.FieldMask, com.google.protobuf.field_mask.FieldMask.Builder] { + def apply(): Builder = new Builder( + __paths = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.field_mask.FieldMask): Builder = new Builder( + __paths = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.paths, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.field_mask.FieldMask.Builder() + def newBuilder(a: com.google.protobuf.field_mask.FieldMask): Builder = com.google.protobuf.field_mask.FieldMask.Builder(a) implicit class FieldMaskLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.field_mask.FieldMask]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.field_mask.FieldMask](_l) { def paths: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.paths)((c_, f_) => c_.copy(paths = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala index 110c4d1e9..e5e2ab4d6 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala @@ -79,28 +79,7 @@ object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protob def fromJavaProto(javaPbSource: com.google.protobuf.SourceContext): com.google.protobuf.source_context.SourceContext = com.google.protobuf.source_context.SourceContext( fileName = javaPbSource.getFileName ) - def merge(`_message__`: com.google.protobuf.source_context.SourceContext, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = { - var __fileName = `_message__`.fileName - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fileName = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.source_context.SourceContext( - fileName = __fileName, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.source_context.SourceContext, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.source_context.SourceContext] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protob lazy val defaultInstance = com.google.protobuf.source_context.SourceContext( fileName = "" ) + final class Builder private ( + private var __fileName: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.source_context.SourceContext] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fileName = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.source_context.SourceContext = { + com.google.protobuf.source_context.SourceContext( + fileName = __fileName, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.source_context.SourceContext, com.google.protobuf.source_context.SourceContext.Builder] { + def apply(): Builder = new Builder( + __fileName = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.source_context.SourceContext): Builder = new Builder( + __fileName = _message__.fileName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.source_context.SourceContext.Builder() + def newBuilder(a: com.google.protobuf.source_context.SourceContext): Builder = com.google.protobuf.source_context.SourceContext.Builder(a) implicit class SourceContextLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.source_context.SourceContext]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.source_context.SourceContext](_l) { def fileName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.fileName)((c_, f_) => c_.copy(fileName = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala index df6c92eb1..3f3da1a6f 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala @@ -77,28 +77,7 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s def fromJavaProto(javaPbSource: com.google.protobuf.ListValue): com.google.protobuf.struct.ListValue = com.google.protobuf.struct.ListValue( values = javaPbSource.getValuesList.asScala.iterator.map(com.google.protobuf.struct.Value.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.struct.ListValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = { - val __values = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value] ++= `_message__`.values) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.ListValue( - values = __values.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.ListValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.ListValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -121,6 +100,46 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s lazy val defaultInstance = com.google.protobuf.struct.ListValue( values = _root_.scala.Seq.empty ) + final class Builder private ( + private var __values: collection.mutable.Builder[com.google.protobuf.struct.Value, _root_.scala.Seq[com.google.protobuf.struct.Value]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.ListValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.ListValue = { + com.google.protobuf.struct.ListValue( + values = __values.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.ListValue, com.google.protobuf.struct.ListValue.Builder] { + def apply(): Builder = new Builder( + __values = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.ListValue): Builder = new Builder( + __values = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value] ++= _message__.values, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.ListValue.Builder() + def newBuilder(a: com.google.protobuf.struct.ListValue): Builder = com.google.protobuf.struct.ListValue.Builder(a) implicit class ListValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.ListValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.struct.ListValue](_l) { def values: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.struct.Value]] = field(_.values)((c_, f_) => c_.copy(values = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala index a6b006fdd..03d4d3304 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Struct.scala @@ -85,28 +85,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru def fromJavaProto(javaPbSource: com.google.protobuf.Struct): com.google.protobuf.struct.Struct = com.google.protobuf.struct.Struct( fields = javaPbSource.getFieldsMap.asScala.iterator.map(__pv => (__pv._1, com.google.protobuf.struct.Value.fromJavaProto(__pv._2))).toMap ) - def merge(`_message__`: com.google.protobuf.struct.Struct, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = { - val __fields = (_root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value] ++= `_message__`.fields) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance)) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Struct( - fields = __fields.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Struct, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -132,6 +111,46 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru lazy val defaultInstance = com.google.protobuf.struct.Struct( fields = _root_.scala.collection.immutable.Map.empty ) + final class Builder private ( + private var __fields: collection.mutable.Builder[(_root_.scala.Predef.String, com.google.protobuf.struct.Value), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, com.google.protobuf.struct.Value]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Struct] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance)) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Struct = { + com.google.protobuf.struct.Struct( + fields = __fields.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Struct, com.google.protobuf.struct.Struct.Builder] { + def apply(): Builder = new Builder( + __fields = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Struct): Builder = new Builder( + __fields = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value] ++= _message__.fields, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Struct.Builder() + def newBuilder(a: com.google.protobuf.struct.Struct): Builder = com.google.protobuf.struct.Struct.Builder(a) @SerialVersionUID(0L) final case class FieldsEntry( key: _root_.scala.Predef.String = "", @@ -207,32 +226,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru object FieldsEntry extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] = this - def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = { - var __key = `_message__`.key - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __key = _input__.readStringRequireUtf8() - case 18 => - __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Struct.FieldsEntry( - key = __key, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct.FieldsEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -257,6 +251,52 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru key = "", value = _root_.scala.None ) + final class Builder private ( + private var __key: _root_.scala.Predef.String, + private var __value: _root_.scala.Option[com.google.protobuf.struct.Value], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Struct.FieldsEntry] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __key = _input__.readStringRequireUtf8() + case 18 => + __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Struct.FieldsEntry = { + com.google.protobuf.struct.Struct.FieldsEntry( + key = __key, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Struct.FieldsEntry, com.google.protobuf.struct.Struct.FieldsEntry.Builder] { + def apply(): Builder = new Builder( + __key = "", + __value = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry): Builder = new Builder( + __key = _message__.key, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Struct.FieldsEntry.Builder() + def newBuilder(a: com.google.protobuf.struct.Struct.FieldsEntry): Builder = com.google.protobuf.struct.Struct.FieldsEntry.Builder(a) implicit class FieldsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct.FieldsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.struct.Struct.FieldsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Value] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala index f21c8bae9..0b7b962e0 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/struct/Value.scala @@ -151,38 +151,7 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc case _ => com.google.protobuf.struct.Value.Kind.Empty } ) - def merge(`_message__`: com.google.protobuf.struct.Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = { - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var __kind = `_message__`.kind - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __kind = com.google.protobuf.struct.Value.Kind.NullValue(com.google.protobuf.struct.NullValue.fromValue(_input__.readEnum())) - case 17 => - __kind = com.google.protobuf.struct.Value.Kind.NumberValue(_input__.readDouble()) - case 26 => - __kind = com.google.protobuf.struct.Value.Kind.StringValue(_input__.readStringRequireUtf8()) - case 32 => - __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool()) - case 42 => - __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, _message__.kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance))) - case 50 => - __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, _message__.kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Value( - kind = __kind, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -216,6 +185,56 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc lazy val defaultInstance = com.google.protobuf.struct.Value( kind = com.google.protobuf.struct.Value.Kind.Empty ) + final class Builder private ( + private var __kind: com.google.protobuf.struct.Value.Kind, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __kind = com.google.protobuf.struct.Value.Kind.NullValue(com.google.protobuf.struct.NullValue.fromValue(_input__.readEnum())) + case 17 => + __kind = com.google.protobuf.struct.Value.Kind.NumberValue(_input__.readDouble()) + case 26 => + __kind = com.google.protobuf.struct.Value.Kind.StringValue(_input__.readStringRequireUtf8()) + case 32 => + __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool()) + case 42 => + __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance))) + case 50 => + __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Value = { + com.google.protobuf.struct.Value( + kind = __kind, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Value, com.google.protobuf.struct.Value.Builder] { + def apply(): Builder = new Builder( + __kind = com.google.protobuf.struct.Value.Kind.Empty, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Value): Builder = new Builder( + __kind = _message__.kind, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Value.Builder() + def newBuilder(a: com.google.protobuf.struct.Value): Builder = com.google.protobuf.struct.Value.Builder(a) sealed trait Kind extends _root_.scalapb.GeneratedOneof { def isEmpty: _root_.scala.Boolean = false def isDefined: _root_.scala.Boolean = true diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala index 6c18eadba..c3d2617fe 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala @@ -185,32 +185,7 @@ object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.t seconds = javaPbSource.getSeconds.longValue, nanos = javaPbSource.getNanos.intValue ) - def merge(`_message__`: com.google.protobuf.timestamp.Timestamp, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = { - var __seconds = `_message__`.seconds - var __nanos = `_message__`.nanos - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __seconds = _input__.readInt64() - case 16 => - __nanos = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.timestamp.Timestamp( - seconds = __seconds, - nanos = __nanos, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.timestamp.Timestamp, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.timestamp.Timestamp] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -229,6 +204,52 @@ object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.t seconds = 0L, nanos = 0 ) + final class Builder private ( + private var __seconds: _root_.scala.Long, + private var __nanos: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.timestamp.Timestamp] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __seconds = _input__.readInt64() + case 16 => + __nanos = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.timestamp.Timestamp = { + com.google.protobuf.timestamp.Timestamp( + seconds = __seconds, + nanos = __nanos, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.timestamp.Timestamp, com.google.protobuf.timestamp.Timestamp.Builder] { + def apply(): Builder = new Builder( + __seconds = 0L, + __nanos = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.timestamp.Timestamp): Builder = new Builder( + __seconds = _message__.seconds, + __nanos = _message__.nanos, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.timestamp.Timestamp.Builder() + def newBuilder(a: com.google.protobuf.timestamp.Timestamp): Builder = com.google.protobuf.timestamp.Timestamp.Builder(a) implicit class TimestampLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.timestamp.Timestamp]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.timestamp.Timestamp](_l) { def seconds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.seconds)((c_, f_) => c_.copy(seconds = f_)) def nanos: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.nanos)((c_, f_) => c_.copy(nanos = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala index 83c1f248a..f48e2f102 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Enum.scala @@ -164,44 +164,7 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = if (javaPbSource.hasSourceContext) Some(com.google.protobuf.source_context.SourceContext.fromJavaProto(javaPbSource.getSourceContext)) else _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.fromValue(javaPbSource.getSyntaxValue.intValue) ) - def merge(`_message__`: com.google.protobuf.`type`.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = { - var __name = `_message__`.name - val __enumvalue = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue] ++= `_message__`.enumvalue) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __sourceContext = `_message__`.sourceContext - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance) - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 34 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 40 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Enum( - name = __name, - enumvalue = __enumvalue.result(), - options = __options.result(), - sourceContext = __sourceContext, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Enum] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -238,6 +201,70 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __enumvalue: collection.mutable.Builder[com.google.protobuf.`type`.EnumValue, _root_.scala.Seq[com.google.protobuf.`type`.EnumValue]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Enum] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance) + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 34 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 40 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Enum = { + com.google.protobuf.`type`.Enum( + name = __name, + enumvalue = __enumvalue.result(), + options = __options.result(), + sourceContext = __sourceContext, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Enum, com.google.protobuf.`type`.Enum.Builder] { + def apply(): Builder = new Builder( + __name = "", + __enumvalue = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __sourceContext = _root_.scala.None, + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Enum): Builder = new Builder( + __name = _message__.name, + __enumvalue = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue] ++= _message__.enumvalue, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __sourceContext = _message__.sourceContext, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Enum.Builder() + def newBuilder(a: com.google.protobuf.`type`.Enum): Builder = com.google.protobuf.`type`.Enum.Builder(a) implicit class EnumLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.Enum]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.Enum](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def enumvalue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.`type`.EnumValue]] = field(_.enumvalue)((c_, f_) => c_.copy(enumvalue = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala index 8323c03ea..936725236 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala @@ -123,36 +123,7 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.` number = javaPbSource.getNumber.intValue, options = javaPbSource.getOptionsList.asScala.iterator.map(com.google.protobuf.`type`.OptionProto.fromJavaProto).toSeq ) - def merge(`_message__`: com.google.protobuf.`type`.EnumValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = { - var __name = `_message__`.name - var __number = `_message__`.number - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 16 => - __number = _input__.readInt32() - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.EnumValue( - name = __name, - number = __number, - options = __options.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.EnumValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.EnumValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -179,6 +150,58 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.` number = 0, options = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __number: _root_.scala.Int, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.EnumValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 16 => + __number = _input__.readInt32() + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.EnumValue = { + com.google.protobuf.`type`.EnumValue( + name = __name, + number = __number, + options = __options.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.EnumValue, com.google.protobuf.`type`.EnumValue.Builder] { + def apply(): Builder = new Builder( + __name = "", + __number = 0, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.EnumValue): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.EnumValue.Builder() + def newBuilder(a: com.google.protobuf.`type`.EnumValue): Builder = com.google.protobuf.`type`.EnumValue.Builder(a) implicit class EnumValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.EnumValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.EnumValue](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def number: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.number)((c_, f_) => c_.copy(number = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala index 8b79f0aa4..c52d1625f 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Field.scala @@ -293,64 +293,7 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type jsonName = javaPbSource.getJsonName, defaultValue = javaPbSource.getDefaultValue ) - def merge(`_message__`: com.google.protobuf.`type`.Field, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = { - var __kind = `_message__`.kind - var __cardinality = `_message__`.cardinality - var __number = `_message__`.number - var __name = `_message__`.name - var __typeUrl = `_message__`.typeUrl - var __oneofIndex = `_message__`.oneofIndex - var __packed = `_message__`.packed - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __jsonName = `_message__`.jsonName - var __defaultValue = `_message__`.defaultValue - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __kind = com.google.protobuf.`type`.Field.Kind.fromValue(_input__.readEnum()) - case 16 => - __cardinality = com.google.protobuf.`type`.Field.Cardinality.fromValue(_input__.readEnum()) - case 24 => - __number = _input__.readInt32() - case 34 => - __name = _input__.readStringRequireUtf8() - case 50 => - __typeUrl = _input__.readStringRequireUtf8() - case 56 => - __oneofIndex = _input__.readInt32() - case 64 => - __packed = _input__.readBool() - case 74 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 82 => - __jsonName = _input__.readStringRequireUtf8() - case 90 => - __defaultValue = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Field( - kind = __kind, - cardinality = __cardinality, - number = __number, - name = __name, - typeUrl = __typeUrl, - oneofIndex = __oneofIndex, - packed = __packed, - options = __options.result(), - jsonName = __jsonName, - defaultValue = __defaultValue, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Field, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Field] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -396,6 +339,100 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type jsonName = "", defaultValue = "" ) + final class Builder private ( + private var __kind: com.google.protobuf.`type`.Field.Kind, + private var __cardinality: com.google.protobuf.`type`.Field.Cardinality, + private var __number: _root_.scala.Int, + private var __name: _root_.scala.Predef.String, + private var __typeUrl: _root_.scala.Predef.String, + private var __oneofIndex: _root_.scala.Int, + private var __packed: _root_.scala.Boolean, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __jsonName: _root_.scala.Predef.String, + private var __defaultValue: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Field] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __kind = com.google.protobuf.`type`.Field.Kind.fromValue(_input__.readEnum()) + case 16 => + __cardinality = com.google.protobuf.`type`.Field.Cardinality.fromValue(_input__.readEnum()) + case 24 => + __number = _input__.readInt32() + case 34 => + __name = _input__.readStringRequireUtf8() + case 50 => + __typeUrl = _input__.readStringRequireUtf8() + case 56 => + __oneofIndex = _input__.readInt32() + case 64 => + __packed = _input__.readBool() + case 74 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 82 => + __jsonName = _input__.readStringRequireUtf8() + case 90 => + __defaultValue = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Field = { + com.google.protobuf.`type`.Field( + kind = __kind, + cardinality = __cardinality, + number = __number, + name = __name, + typeUrl = __typeUrl, + oneofIndex = __oneofIndex, + packed = __packed, + options = __options.result(), + jsonName = __jsonName, + defaultValue = __defaultValue, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Field, com.google.protobuf.`type`.Field.Builder] { + def apply(): Builder = new Builder( + __kind = com.google.protobuf.`type`.Field.Kind.TYPE_UNKNOWN, + __cardinality = com.google.protobuf.`type`.Field.Cardinality.CARDINALITY_UNKNOWN, + __number = 0, + __name = "", + __typeUrl = "", + __oneofIndex = 0, + __packed = false, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __jsonName = "", + __defaultValue = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Field): Builder = new Builder( + __kind = _message__.kind, + __cardinality = _message__.cardinality, + __number = _message__.number, + __name = _message__.name, + __typeUrl = _message__.typeUrl, + __oneofIndex = _message__.oneofIndex, + __packed = _message__.packed, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __jsonName = _message__.jsonName, + __defaultValue = _message__.defaultValue, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Field.Builder() + def newBuilder(a: com.google.protobuf.`type`.Field): Builder = com.google.protobuf.`type`.Field.Builder(a) /** Basic field types. */ sealed abstract class Kind(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala index 73dad9221..9b553a972 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala @@ -104,32 +104,7 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf name = javaPbSource.getName, value = if (javaPbSource.hasValue) Some(com.google.protobuf.any.Any.fromJavaProto(javaPbSource.getValue)) else _root_.scala.None ) - def merge(`_message__`: com.google.protobuf.`type`.OptionProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = { - var __name = `_message__`.name - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.OptionProto( - name = __name, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.OptionProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.OptionProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -154,6 +129,52 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf name = "", value = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __value: _root_.scala.Option[com.google.protobuf.any.Any], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.OptionProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.OptionProto = { + com.google.protobuf.`type`.OptionProto( + name = __name, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.OptionProto, com.google.protobuf.`type`.OptionProto.Builder] { + def apply(): Builder = new Builder( + __name = "", + __value = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.OptionProto): Builder = new Builder( + __name = _message__.name, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.OptionProto.Builder() + def newBuilder(a: com.google.protobuf.`type`.OptionProto): Builder = com.google.protobuf.`type`.OptionProto.Builder(a) implicit class OptionProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.OptionProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.OptionProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.any.Any] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala index f07665a78..1e838a7de 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/type/Type.scala @@ -183,48 +183,7 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = if (javaPbSource.hasSourceContext) Some(com.google.protobuf.source_context.SourceContext.fromJavaProto(javaPbSource.getSourceContext)) else _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.fromValue(javaPbSource.getSyntaxValue.intValue) ) - def merge(`_message__`: com.google.protobuf.`type`.Type, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = { - var __name = `_message__`.name - val __fields = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field] ++= `_message__`.fields) - val __oneofs = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.oneofs) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __sourceContext = `_message__`.sourceContext - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance) - case 26 => - __oneofs += _input__.readStringRequireUtf8() - case 34 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 42 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 48 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Type( - name = __name, - fields = __fields.result(), - oneofs = __oneofs.result(), - options = __options.result(), - sourceContext = __sourceContext, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Type, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Type] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -263,6 +222,76 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __fields: collection.mutable.Builder[com.google.protobuf.`type`.Field, _root_.scala.Seq[com.google.protobuf.`type`.Field]], + private var __oneofs: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Type] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance) + case 26 => + __oneofs += _input__.readStringRequireUtf8() + case 34 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 42 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 48 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Type = { + com.google.protobuf.`type`.Type( + name = __name, + fields = __fields.result(), + oneofs = __oneofs.result(), + options = __options.result(), + sourceContext = __sourceContext, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Type, com.google.protobuf.`type`.Type.Builder] { + def apply(): Builder = new Builder( + __name = "", + __fields = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field], + __oneofs = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __sourceContext = _root_.scala.None, + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Type): Builder = new Builder( + __name = _message__.name, + __fields = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field] ++= _message__.fields, + __oneofs = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.oneofs, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __sourceContext = _message__.sourceContext, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Type.Builder() + def newBuilder(a: com.google.protobuf.`type`.Type): Builder = com.google.protobuf.`type`.Type.Builder(a) implicit class TypeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.Type]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.Type](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def fields: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.`type`.Field]] = field(_.fields)((c_, f_) => c_.copy(fields = f_)) diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala index 59910854d..b376330dc 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala @@ -79,28 +79,7 @@ object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.w def fromJavaProto(javaPbSource: com.google.protobuf.BoolValue): com.google.protobuf.wrappers.BoolValue = com.google.protobuf.wrappers.BoolValue( value = javaPbSource.getValue.booleanValue ) - def merge(`_message__`: com.google.protobuf.wrappers.BoolValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readBool() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.BoolValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.BoolValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BoolValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.w lazy val defaultInstance = com.google.protobuf.wrappers.BoolValue( value = false ) + final class Builder private ( + private var __value: _root_.scala.Boolean, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.BoolValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readBool() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.BoolValue = { + com.google.protobuf.wrappers.BoolValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.BoolValue, com.google.protobuf.wrappers.BoolValue.Builder] { + def apply(): Builder = new Builder( + __value = false, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.BoolValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.BoolValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.BoolValue): Builder = com.google.protobuf.wrappers.BoolValue.Builder(a) implicit class BoolValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.BoolValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.BoolValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala index bc3ec4589..bd6872d90 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala @@ -79,28 +79,7 @@ object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. def fromJavaProto(javaPbSource: com.google.protobuf.BytesValue): com.google.protobuf.wrappers.BytesValue = com.google.protobuf.wrappers.BytesValue( value = javaPbSource.getValue ) - def merge(`_message__`: com.google.protobuf.wrappers.BytesValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __value = _input__.readBytes() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.BytesValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.BytesValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BytesValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.BytesValue( value = _root_.com.google.protobuf.ByteString.EMPTY ) + final class Builder private ( + private var __value: _root_.com.google.protobuf.ByteString, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.BytesValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __value = _input__.readBytes() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.BytesValue = { + com.google.protobuf.wrappers.BytesValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.BytesValue, com.google.protobuf.wrappers.BytesValue.Builder] { + def apply(): Builder = new Builder( + __value = _root_.com.google.protobuf.ByteString.EMPTY, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.BytesValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.BytesValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.BytesValue): Builder = com.google.protobuf.wrappers.BytesValue.Builder(a) implicit class BytesValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.BytesValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.BytesValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala index 9e8655d1c..b08d61239 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala @@ -79,28 +79,7 @@ object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf def fromJavaProto(javaPbSource: com.google.protobuf.DoubleValue): com.google.protobuf.wrappers.DoubleValue = com.google.protobuf.wrappers.DoubleValue( value = javaPbSource.getValue.doubleValue ) - def merge(`_message__`: com.google.protobuf.wrappers.DoubleValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 9 => - __value = _input__.readDouble() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.DoubleValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.DoubleValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.DoubleValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.DoubleValue( value = 0.0 ) + final class Builder private ( + private var __value: _root_.scala.Double, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.DoubleValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 9 => + __value = _input__.readDouble() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.DoubleValue = { + com.google.protobuf.wrappers.DoubleValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.DoubleValue, com.google.protobuf.wrappers.DoubleValue.Builder] { + def apply(): Builder = new Builder( + __value = 0.0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.DoubleValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.DoubleValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.DoubleValue): Builder = com.google.protobuf.wrappers.DoubleValue.Builder(a) implicit class DoubleValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.DoubleValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.DoubleValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Double] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala index 0f57a040c..d8e8ee50e 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala @@ -79,28 +79,7 @@ object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. def fromJavaProto(javaPbSource: com.google.protobuf.FloatValue): com.google.protobuf.wrappers.FloatValue = com.google.protobuf.wrappers.FloatValue( value = javaPbSource.getValue.floatValue ) - def merge(`_message__`: com.google.protobuf.wrappers.FloatValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 13 => - __value = _input__.readFloat() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.FloatValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.FloatValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.FloatValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.FloatValue( value = 0.0f ) + final class Builder private ( + private var __value: _root_.scala.Float, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.FloatValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 13 => + __value = _input__.readFloat() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.FloatValue = { + com.google.protobuf.wrappers.FloatValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.FloatValue, com.google.protobuf.wrappers.FloatValue.Builder] { + def apply(): Builder = new Builder( + __value = 0.0f, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.FloatValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.FloatValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.FloatValue): Builder = com.google.protobuf.wrappers.FloatValue.Builder(a) implicit class FloatValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.FloatValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.FloatValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Float] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala index a86abdb6c..d5a775e46 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala @@ -79,28 +79,7 @@ object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. def fromJavaProto(javaPbSource: com.google.protobuf.Int32Value): com.google.protobuf.wrappers.Int32Value = com.google.protobuf.wrappers.Int32Value( value = javaPbSource.getValue.intValue ) - def merge(`_message__`: com.google.protobuf.wrappers.Int32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.Int32Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.Int32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int32Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.Int32Value( value = 0 ) + final class Builder private ( + private var __value: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.Int32Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.Int32Value = { + com.google.protobuf.wrappers.Int32Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.Int32Value, com.google.protobuf.wrappers.Int32Value.Builder] { + def apply(): Builder = new Builder( + __value = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.Int32Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.Int32Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.Int32Value): Builder = com.google.protobuf.wrappers.Int32Value.Builder(a) implicit class Int32ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.Int32Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.Int32Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala index 3ee60ea4d..9c6f7cd88 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala @@ -79,28 +79,7 @@ object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. def fromJavaProto(javaPbSource: com.google.protobuf.Int64Value): com.google.protobuf.wrappers.Int64Value = com.google.protobuf.wrappers.Int64Value( value = javaPbSource.getValue.longValue ) - def merge(`_message__`: com.google.protobuf.wrappers.Int64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readInt64() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.Int64Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.Int64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int64Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.Int64Value( value = 0L ) + final class Builder private ( + private var __value: _root_.scala.Long, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.Int64Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readInt64() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.Int64Value = { + com.google.protobuf.wrappers.Int64Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.Int64Value, com.google.protobuf.wrappers.Int64Value.Builder] { + def apply(): Builder = new Builder( + __value = 0L, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.Int64Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.Int64Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.Int64Value): Builder = com.google.protobuf.wrappers.Int64Value.Builder(a) implicit class Int64ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.Int64Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.Int64Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala index 4fa784d98..c48740a72 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala @@ -79,28 +79,7 @@ object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf def fromJavaProto(javaPbSource: com.google.protobuf.StringValue): com.google.protobuf.wrappers.StringValue = com.google.protobuf.wrappers.StringValue( value = javaPbSource.getValue ) - def merge(`_message__`: com.google.protobuf.wrappers.StringValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __value = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.StringValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.StringValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.StringValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.StringValue( value = "" ) + final class Builder private ( + private var __value: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.StringValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __value = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.StringValue = { + com.google.protobuf.wrappers.StringValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.StringValue, com.google.protobuf.wrappers.StringValue.Builder] { + def apply(): Builder = new Builder( + __value = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.StringValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.StringValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.StringValue): Builder = com.google.protobuf.wrappers.StringValue.Builder(a) implicit class StringValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.StringValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.StringValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala index d356b0552..2ddea013f 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala @@ -79,28 +79,7 @@ object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf def fromJavaProto(javaPbSource: com.google.protobuf.UInt32Value): com.google.protobuf.wrappers.UInt32Value = com.google.protobuf.wrappers.UInt32Value( value = javaPbSource.getValue.intValue ) - def merge(`_message__`: com.google.protobuf.wrappers.UInt32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readUInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.UInt32Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.UInt32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt32Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.UInt32Value( value = 0 ) + final class Builder private ( + private var __value: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.UInt32Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readUInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.UInt32Value = { + com.google.protobuf.wrappers.UInt32Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.UInt32Value, com.google.protobuf.wrappers.UInt32Value.Builder] { + def apply(): Builder = new Builder( + __value = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.UInt32Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.UInt32Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.UInt32Value): Builder = com.google.protobuf.wrappers.UInt32Value.Builder(a) implicit class UInt32ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.UInt32Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.UInt32Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala index 5a57c0d43..ab1214f55 100644 --- a/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala +++ b/scalapb-runtime/jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala @@ -79,28 +79,7 @@ object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf def fromJavaProto(javaPbSource: com.google.protobuf.UInt64Value): com.google.protobuf.wrappers.UInt64Value = com.google.protobuf.wrappers.UInt64Value( value = javaPbSource.getValue.longValue ) - def merge(`_message__`: com.google.protobuf.wrappers.UInt64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readUInt64() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.UInt64Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.UInt64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt64Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -117,6 +96,46 @@ object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.UInt64Value( value = 0L ) + final class Builder private ( + private var __value: _root_.scala.Long, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.UInt64Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readUInt64() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.UInt64Value = { + com.google.protobuf.wrappers.UInt64Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.UInt64Value, com.google.protobuf.wrappers.UInt64Value.Builder] { + def apply(): Builder = new Builder( + __value = 0L, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.UInt64Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.UInt64Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.UInt64Value): Builder = com.google.protobuf.wrappers.UInt64Value.Builder(a) implicit class UInt64ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.UInt64Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.UInt64Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala index 472ce847b..9e7f7cf6a 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/any/Any.scala @@ -195,32 +195,7 @@ final case class Any( object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.AnyCompanionMethods { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any] with scalapb.AnyCompanionMethods = this - def merge(`_message__`: com.google.protobuf.any.Any, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = { - var __typeUrl = `_message__`.typeUrl - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __typeUrl = _input__.readStringRequireUtf8() - case 18 => - __value = _input__.readBytes() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.any.Any( - typeUrl = __typeUrl, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.any.Any, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.any.Any = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.any.Any] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -239,6 +214,52 @@ object Any extends scalapb.GeneratedMessageCompanion[com.google.protobuf.any.Any typeUrl = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) + final class Builder private ( + private var __typeUrl: _root_.scala.Predef.String, + private var __value: _root_.com.google.protobuf.ByteString, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.any.Any] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __typeUrl = _input__.readStringRequireUtf8() + case 18 => + __value = _input__.readBytes() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.any.Any = { + com.google.protobuf.any.Any( + typeUrl = __typeUrl, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.any.Any, com.google.protobuf.any.Any.Builder] { + def apply(): Builder = new Builder( + __typeUrl = "", + __value = _root_.com.google.protobuf.ByteString.EMPTY, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.any.Any): Builder = new Builder( + __typeUrl = _message__.typeUrl, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.any.Any.Builder() + def newBuilder(a: com.google.protobuf.any.Any): Builder = com.google.protobuf.any.Any.Builder(a) implicit class AnyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.any.Any]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.any.Any](_l) { def typeUrl: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.typeUrl)((c_, f_) => c_.copy(typeUrl = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala index 61d474fa8..7948fff3d 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Api.scala @@ -216,52 +216,7 @@ final case class Api( object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api] = this - def merge(`_message__`: com.google.protobuf.api.Api, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = { - var __name = `_message__`.name - val __methods = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method] ++= `_message__`.methods) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __version = `_message__`.version - var __sourceContext = `_message__`.sourceContext - val __mixins = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin] ++= `_message__`.mixins) - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance) - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 34 => - __version = _input__.readStringRequireUtf8() - case 42 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 50 => - __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance) - case 56 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Api( - name = __name, - methods = __methods.result(), - options = __options.result(), - version = __version, - sourceContext = __sourceContext, - mixins = __mixins.result(), - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Api, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Api = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Api] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -303,6 +258,82 @@ object Api extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Api mixins = _root_.scala.Seq.empty, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __methods: collection.mutable.Builder[com.google.protobuf.api.Method, _root_.scala.Seq[com.google.protobuf.api.Method]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __version: _root_.scala.Predef.String, + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __mixins: collection.mutable.Builder[com.google.protobuf.api.Mixin, _root_.scala.Seq[com.google.protobuf.api.Mixin]], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Api] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __methods += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Method.defaultInstance) + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 34 => + __version = _input__.readStringRequireUtf8() + case 42 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 50 => + __mixins += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.api.Mixin.defaultInstance) + case 56 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Api = { + com.google.protobuf.api.Api( + name = __name, + methods = __methods.result(), + options = __options.result(), + version = __version, + sourceContext = __sourceContext, + mixins = __mixins.result(), + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Api, com.google.protobuf.api.Api.Builder] { + def apply(): Builder = new Builder( + __name = "", + __methods = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __version = "", + __sourceContext = _root_.scala.None, + __mixins = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin], + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Api): Builder = new Builder( + __name = _message__.name, + __methods = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Method] ++= _message__.methods, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __version = _message__.version, + __sourceContext = _message__.sourceContext, + __mixins = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.api.Mixin] ++= _message__.mixins, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Api.Builder() + def newBuilder(a: com.google.protobuf.api.Api): Builder = com.google.protobuf.api.Api.Builder(a) implicit class ApiLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Api]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Api](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def methods: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.api.Method]] = field(_.methods)((c_, f_) => c_.copy(methods = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala index 98c29e37b..11b0e0bcc 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Method.scala @@ -198,52 +198,7 @@ final case class Method( object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Method] = this - def merge(`_message__`: com.google.protobuf.api.Method, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = { - var __name = `_message__`.name - var __requestTypeUrl = `_message__`.requestTypeUrl - var __requestStreaming = `_message__`.requestStreaming - var __responseTypeUrl = `_message__`.responseTypeUrl - var __responseStreaming = `_message__`.responseStreaming - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __requestTypeUrl = _input__.readStringRequireUtf8() - case 24 => - __requestStreaming = _input__.readBool() - case 34 => - __responseTypeUrl = _input__.readStringRequireUtf8() - case 40 => - __responseStreaming = _input__.readBool() - case 50 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 56 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Method( - name = __name, - requestTypeUrl = __requestTypeUrl, - requestStreaming = __requestStreaming, - responseTypeUrl = __responseTypeUrl, - responseStreaming = __responseStreaming, - options = __options.result(), - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Method, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Method = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Method] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -282,6 +237,82 @@ object Method extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api. options = _root_.scala.Seq.empty, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __requestTypeUrl: _root_.scala.Predef.String, + private var __requestStreaming: _root_.scala.Boolean, + private var __responseTypeUrl: _root_.scala.Predef.String, + private var __responseStreaming: _root_.scala.Boolean, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Method] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __requestTypeUrl = _input__.readStringRequireUtf8() + case 24 => + __requestStreaming = _input__.readBool() + case 34 => + __responseTypeUrl = _input__.readStringRequireUtf8() + case 40 => + __responseStreaming = _input__.readBool() + case 50 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 56 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Method = { + com.google.protobuf.api.Method( + name = __name, + requestTypeUrl = __requestTypeUrl, + requestStreaming = __requestStreaming, + responseTypeUrl = __responseTypeUrl, + responseStreaming = __responseStreaming, + options = __options.result(), + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Method, com.google.protobuf.api.Method.Builder] { + def apply(): Builder = new Builder( + __name = "", + __requestTypeUrl = "", + __requestStreaming = false, + __responseTypeUrl = "", + __responseStreaming = false, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Method): Builder = new Builder( + __name = _message__.name, + __requestTypeUrl = _message__.requestTypeUrl, + __requestStreaming = _message__.requestStreaming, + __responseTypeUrl = _message__.responseTypeUrl, + __responseStreaming = _message__.responseStreaming, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Method.Builder() + def newBuilder(a: com.google.protobuf.api.Method): Builder = com.google.protobuf.api.Method.Builder(a) implicit class MethodLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Method]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Method](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def requestTypeUrl: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.requestTypeUrl)((c_, f_) => c_.copy(requestTypeUrl = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala index fd096cb48..81e60fd92 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/api/Mixin.scala @@ -169,32 +169,7 @@ final case class Mixin( object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.api.Mixin] = this - def merge(`_message__`: com.google.protobuf.api.Mixin, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = { - var __name = `_message__`.name - var __root = `_message__`.root - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __root = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.api.Mixin( - name = __name, - root = __root, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.api.Mixin, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.api.Mixin = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.api.Mixin] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -213,6 +188,52 @@ object Mixin extends scalapb.GeneratedMessageCompanion[com.google.protobuf.api.M name = "", root = "" ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __root: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.api.Mixin] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __root = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.api.Mixin = { + com.google.protobuf.api.Mixin( + name = __name, + root = __root, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.api.Mixin, com.google.protobuf.api.Mixin.Builder] { + def apply(): Builder = new Builder( + __name = "", + __root = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.api.Mixin): Builder = new Builder( + __name = _message__.name, + __root = _message__.root, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.api.Mixin.Builder() + def newBuilder(a: com.google.protobuf.api.Mixin): Builder = com.google.protobuf.api.Mixin.Builder(a) implicit class MixinLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.api.Mixin]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.api.Mixin](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def root: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.root)((c_, f_) => c_.copy(root = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala index 91ada7cdf..fbdeec488 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorRequest.scala @@ -132,40 +132,7 @@ final case class CodeGeneratorRequest( object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] = this - def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = { - val __fileToGenerate = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.fileToGenerate) - var __parameter = `_message__`.parameter - val __protoFile = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= `_message__`.protoFile) - var __compilerVersion = `_message__`.compilerVersion - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fileToGenerate += _input__.readStringRequireUtf8() - case 18 => - __parameter = Option(_input__.readStringRequireUtf8()) - case 122 => - __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) - case 26 => - __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorRequest( - fileToGenerate = __fileToGenerate.result(), - parameter = __parameter, - protoFile = __protoFile.result(), - compilerVersion = __compilerVersion, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -195,6 +162,64 @@ object CodeGeneratorRequest extends scalapb.GeneratedMessageCompanion[com.google protoFile = _root_.scala.Seq.empty, compilerVersion = _root_.scala.None ) + final class Builder private ( + private var __fileToGenerate: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __parameter: _root_.scala.Option[_root_.scala.Predef.String], + private var __protoFile: collection.mutable.Builder[com.google.protobuf.descriptor.FileDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]], + private var __compilerVersion: _root_.scala.Option[com.google.protobuf.compiler.plugin.Version], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorRequest] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fileToGenerate += _input__.readStringRequireUtf8() + case 18 => + __parameter = Option(_input__.readStringRequireUtf8()) + case 122 => + __protoFile += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) + case 26 => + __compilerVersion = Option(_root_.scalapb.LiteParser.readMessage(_input__, __compilerVersion.getOrElse(com.google.protobuf.compiler.plugin.Version.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorRequest = { + com.google.protobuf.compiler.plugin.CodeGeneratorRequest( + fileToGenerate = __fileToGenerate.result(), + parameter = __parameter, + protoFile = __protoFile.result(), + compilerVersion = __compilerVersion, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorRequest, com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder] { + def apply(): Builder = new Builder( + __fileToGenerate = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __parameter = _root_.scala.None, + __protoFile = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto], + __compilerVersion = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorRequest): Builder = new Builder( + __fileToGenerate = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.fileToGenerate, + __parameter = _message__.parameter, + __protoFile = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= _message__.protoFile, + __compilerVersion = _message__.compilerVersion, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorRequest): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorRequest.Builder(a) implicit class CodeGeneratorRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorRequest](_l) { def fileToGenerate: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.fileToGenerate)((c_, f_) => c_.copy(fileToGenerate = f_)) def parameter: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getParameter)((c_, f_) => c_.copy(parameter = Option(f_))) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala index e7911c443..75ca7bde9 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/CodeGeneratorResponse.scala @@ -87,32 +87,7 @@ final case class CodeGeneratorResponse( object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] = this - 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 - 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 - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __error = Option(_input__.readStringRequireUtf8()) - case 122 => - __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorResponse( - error = __error, - file = __file.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -140,6 +115,52 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl error = _root_.scala.None, file = _root_.scala.Seq.empty ) + final class Builder private ( + private var __error: _root_.scala.Option[_root_.scala.Predef.String], + private var __file: collection.mutable.Builder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, _root_.scala.Seq[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __error = Option(_input__.readStringRequireUtf8()) + case 122 => + __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse = { + com.google.protobuf.compiler.plugin.CodeGeneratorResponse( + error = __error, + file = __file.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder] { + def apply(): Builder = new Builder( + __error = _root_.scala.None, + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): Builder = new Builder( + __error = _message__.error, + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] ++= _message__.file, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorResponse): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.Builder(a) /** Represents a single generated file. * * @param name @@ -276,36 +297,7 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl object File extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = this - def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = { - var __name = `_message__`.name - var __insertionPoint = `_message__`.insertionPoint - var __content = `_message__`.content - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __insertionPoint = Option(_input__.readStringRequireUtf8()) - case 122 => - __content = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File( - name = __name, - insertionPoint = __insertionPoint, - content = __content, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -326,6 +318,58 @@ object CodeGeneratorResponse extends scalapb.GeneratedMessageCompanion[com.googl insertionPoint = _root_.scala.None, content = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __insertionPoint: _root_.scala.Option[_root_.scala.Predef.String], + private var __content: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __insertionPoint = Option(_input__.readStringRequireUtf8()) + case 122 => + __content = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File = { + com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File( + name = __name, + insertionPoint = __insertionPoint, + content = __content, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __insertionPoint = _root_.scala.None, + __content = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File): Builder = new Builder( + __name = _message__.name, + __insertionPoint = _message__.insertionPoint, + __content = _message__.content, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File): Builder = com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File.Builder(a) implicit class FileLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.CodeGeneratorResponse.File](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala index 068f9c985..4e3d166b9 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/compiler/plugin/Version.scala @@ -106,40 +106,7 @@ final case class Version( object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.compiler.plugin.Version] = this - def merge(`_message__`: com.google.protobuf.compiler.plugin.Version, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = { - var __major = `_message__`.major - var __minor = `_message__`.minor - var __patch = `_message__`.patch - var __suffix = `_message__`.suffix - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __major = Option(_input__.readInt32()) - case 16 => - __minor = Option(_input__.readInt32()) - case 24 => - __patch = Option(_input__.readInt32()) - case 34 => - __suffix = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.compiler.plugin.Version( - major = __major, - minor = __minor, - patch = __patch, - suffix = __suffix, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.compiler.plugin.Version, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.compiler.plugin.Version = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.compiler.plugin.Version] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -162,6 +129,64 @@ object Version extends scalapb.GeneratedMessageCompanion[com.google.protobuf.com patch = _root_.scala.None, suffix = _root_.scala.None ) + final class Builder private ( + private var __major: _root_.scala.Option[_root_.scala.Int], + private var __minor: _root_.scala.Option[_root_.scala.Int], + private var __patch: _root_.scala.Option[_root_.scala.Int], + private var __suffix: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.compiler.plugin.Version] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __major = Option(_input__.readInt32()) + case 16 => + __minor = Option(_input__.readInt32()) + case 24 => + __patch = Option(_input__.readInt32()) + case 34 => + __suffix = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.compiler.plugin.Version = { + com.google.protobuf.compiler.plugin.Version( + major = __major, + minor = __minor, + patch = __patch, + suffix = __suffix, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.compiler.plugin.Version, com.google.protobuf.compiler.plugin.Version.Builder] { + def apply(): Builder = new Builder( + __major = _root_.scala.None, + __minor = _root_.scala.None, + __patch = _root_.scala.None, + __suffix = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.compiler.plugin.Version): Builder = new Builder( + __major = _message__.major, + __minor = _message__.minor, + __patch = _message__.patch, + __suffix = _message__.suffix, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.compiler.plugin.Version.Builder() + def newBuilder(a: com.google.protobuf.compiler.plugin.Version): Builder = com.google.protobuf.compiler.plugin.Version.Builder(a) implicit class VersionLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.compiler.plugin.Version]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.compiler.plugin.Version](_l) { def major: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getMajor)((c_, f_) => c_.copy(major = Option(f_))) def optionalMajor: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.major)((c_, f_) => c_.copy(major = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala index c6dde4571..b59cb36f6 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/DescriptorProto.scala @@ -214,64 +214,7 @@ final case class DescriptorProto( object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = { - var __name = `_message__`.name - val __field = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.field) - val __extension = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.extension) - val __nestedType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= `_message__`.nestedType) - val __enumType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= `_message__`.enumType) - val __extensionRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] ++= `_message__`.extensionRange) - val __oneofDecl = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] ++= `_message__`.oneofDecl) - var __options = `_message__`.options - val __reservedRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] ++= `_message__`.reservedRange) - val __reservedName = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.reservedName) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 50 => - __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 26 => - __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) - case 34 => - __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) - case 42 => - __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance) - case 66 => - __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance) - case 58 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance))) - case 74 => - __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance) - case 82 => - __reservedName += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto( - name = __name, - field = __field.result(), - extension = __extension.result(), - nestedType = __nestedType.result(), - enumType = __enumType.result(), - extensionRange = __extensionRange.result(), - oneofDecl = __oneofDecl.result(), - options = __options, - reservedRange = __reservedRange.result(), - reservedName = __reservedName.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -323,6 +266,100 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot reservedRange = _root_.scala.Seq.empty, reservedName = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __field: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __extension: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __nestedType: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto]], + private var __enumType: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto]], + private var __extensionRange: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange]], + private var __oneofDecl: collection.mutable.Builder[com.google.protobuf.descriptor.OneofDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.OneofDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.MessageOptions], + private var __reservedRange: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto.ReservedRange]], + private var __reservedName: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __field += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 50 => + __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 26 => + __nestedType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) + case 34 => + __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) + case 42 => + __extensionRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.defaultInstance) + case 66 => + __oneofDecl += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.OneofDescriptorProto.defaultInstance) + case 58 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MessageOptions.defaultInstance))) + case 74 => + __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.defaultInstance) + case 82 => + __reservedName += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto = { + com.google.protobuf.descriptor.DescriptorProto( + name = __name, + field = __field.result(), + extension = __extension.result(), + nestedType = __nestedType.result(), + enumType = __enumType.result(), + extensionRange = __extensionRange.result(), + oneofDecl = __oneofDecl.result(), + options = __options, + reservedRange = __reservedRange.result(), + reservedName = __reservedName.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto, com.google.protobuf.descriptor.DescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __field = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __nestedType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto], + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto], + __extensionRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange], + __oneofDecl = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto], + __options = _root_.scala.None, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange], + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto): Builder = new Builder( + __name = _message__.name, + __field = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.field, + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.extension, + __nestedType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= _message__.nestedType, + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= _message__.enumType, + __extensionRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] ++= _message__.extensionRange, + __oneofDecl = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] ++= _message__.oneofDecl, + __options = _message__.options, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] ++= _message__.reservedRange, + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.reservedName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto): Builder = com.google.protobuf.descriptor.DescriptorProto.Builder(a) @SerialVersionUID(0L) final case class ExtensionRange( start: _root_.scala.Option[_root_.scala.Int] = _root_.scala.None, @@ -406,36 +443,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot object ExtensionRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] = this - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto.ExtensionRange( - start = __start, - end = __end, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -462,6 +470,58 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot end = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.ExtensionRangeOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ExtensionRangeOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto.ExtensionRange = { + com.google.protobuf.descriptor.DescriptorProto.ExtensionRange( + start = __start, + end = __end, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto.ExtensionRange, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto.ExtensionRange): Builder = com.google.protobuf.descriptor.DescriptorProto.ExtensionRange.Builder(a) implicit class ExtensionRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ExtensionRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) @@ -561,32 +621,7 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot object ReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] = this - def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.DescriptorProto.ReservedRange( - start = __start, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -605,6 +640,52 @@ object DescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.prot start = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.DescriptorProto.ReservedRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.DescriptorProto.ReservedRange = { + com.google.protobuf.descriptor.DescriptorProto.ReservedRange( + start = __start, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.DescriptorProto.ReservedRange, com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.DescriptorProto.ReservedRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.DescriptorProto.ReservedRange): Builder = com.google.protobuf.descriptor.DescriptorProto.ReservedRange.Builder(a) implicit class ReservedRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ReservedRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.DescriptorProto.ReservedRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala index 9fefc65ce..7e687d0c2 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumDescriptorProto.scala @@ -133,44 +133,7 @@ final case class EnumDescriptorProto( object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = { - var __name = `_message__`.name - val __value = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] ++= `_message__`.value) - var __options = `_message__`.options - val __reservedRange = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] ++= `_message__`.reservedRange) - val __reservedName = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.reservedName) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance))) - case 34 => - __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance) - case 42 => - __reservedName += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumDescriptorProto( - name = __name, - value = __value.result(), - options = __options, - reservedRange = __reservedRange.result(), - reservedName = __reservedName.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -206,6 +169,70 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. reservedRange = _root_.scala.Seq.empty, reservedName = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __value: collection.mutable.Builder[com.google.protobuf.descriptor.EnumValueDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumValueDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.EnumOptions], + private var __reservedRange: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange]], + private var __reservedName: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __value += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumValueDescriptorProto.defaultInstance) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumOptions.defaultInstance))) + case 34 => + __reservedRange += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.defaultInstance) + case 42 => + __reservedName += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumDescriptorProto = { + com.google.protobuf.descriptor.EnumDescriptorProto( + name = __name, + value = __value.result(), + options = __options, + reservedRange = __reservedRange.result(), + reservedName = __reservedName.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumDescriptorProto, com.google.protobuf.descriptor.EnumDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __value = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto], + __options = _root_.scala.None, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange], + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto): Builder = new Builder( + __name = _message__.name, + __value = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] ++= _message__.value, + __options = _message__.options, + __reservedRange = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] ++= _message__.reservedRange, + __reservedName = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.reservedName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumDescriptorProto): Builder = com.google.protobuf.descriptor.EnumDescriptorProto.Builder(a) /** Range of reserved numeric values. Reserved values may not be used by * entries in the same enum. Reserved ranges may not overlap. * @@ -285,32 +312,7 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. object EnumReservedRange extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] = this - def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = { - var __start = `_message__`.start - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __start = Option(_input__.readInt32()) - case 16 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange( - start = __start, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -329,6 +331,52 @@ object EnumDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. start = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __start: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __start = Option(_input__.readInt32()) + case 16 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange = { + com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange( + start = __start, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder] { + def apply(): Builder = new Builder( + __start = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange): Builder = new Builder( + __start = _message__.start, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange): Builder = com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange.Builder(a) implicit class EnumReservedRangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumDescriptorProto.EnumReservedRange](_l) { def start: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getStart)((c_, f_) => c_.copy(start = Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Int]] = field(_.start)((c_, f_) => c_.copy(start = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala index 05a3ae9c7..a7145c50f 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumOptions.scala @@ -100,36 +100,7 @@ final case class EnumOptions( object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = { - var __allowAlias = `_message__`.allowAlias - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 16 => - __allowAlias = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumOptions( - allowAlias = __allowAlias, - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -156,6 +127,58 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __allowAlias: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 16 => + __allowAlias = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumOptions = { + com.google.protobuf.descriptor.EnumOptions( + allowAlias = __allowAlias, + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumOptions, com.google.protobuf.descriptor.EnumOptions.Builder] { + def apply(): Builder = new Builder( + __allowAlias = _root_.scala.None, + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumOptions): Builder = new Builder( + __allowAlias = _message__.allowAlias, + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumOptions): Builder = com.google.protobuf.descriptor.EnumOptions.Builder(a) implicit class EnumOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumOptions](_l) { def allowAlias: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getAllowAlias)((c_, f_) => c_.copy(allowAlias = Option(f_))) def optionalAllowAlias: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.allowAlias)((c_, f_) => c_.copy(allowAlias = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala index d822b265b..8e8113392 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueDescriptorProto.scala @@ -90,36 +90,7 @@ final case class EnumValueDescriptorProto( object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = { - var __name = `_message__`.name - var __number = `_message__`.number - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 16 => - __number = Option(_input__.readInt32()) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumValueDescriptorProto( - name = __name, - number = __number, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -146,6 +117,58 @@ object EnumValueDescriptorProto extends scalapb.GeneratedMessageCompanion[com.go number = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __number: _root_.scala.Option[_root_.scala.Int], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.EnumValueOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumValueDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 16 => + __number = Option(_input__.readInt32()) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.EnumValueOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumValueDescriptorProto = { + com.google.protobuf.descriptor.EnumValueDescriptorProto( + name = __name, + number = __number, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumValueDescriptorProto, com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __number = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumValueDescriptorProto): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumValueDescriptorProto): Builder = com.google.protobuf.descriptor.EnumValueDescriptorProto.Builder(a) implicit class EnumValueDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumValueDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumValueDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala index da4342133..514449905 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/EnumValueOptions.scala @@ -83,32 +83,7 @@ final case class EnumValueOptions( object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.EnumValueOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = { - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.EnumValueOptions( - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.EnumValueOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.EnumValueOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -133,6 +108,52 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[com.google.pro deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.EnumValueOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.EnumValueOptions = { + com.google.protobuf.descriptor.EnumValueOptions( + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.EnumValueOptions, com.google.protobuf.descriptor.EnumValueOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.EnumValueOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.EnumValueOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.EnumValueOptions): Builder = com.google.protobuf.descriptor.EnumValueOptions.Builder(a) implicit class EnumValueOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.EnumValueOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.EnumValueOptions](_l) { def deprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getDeprecated)((c_, f_) => c_.copy(deprecated = Option(f_))) def optionalDeprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.deprecated)((c_, f_) => c_.copy(deprecated = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala index 944a5f91f..a069f3d35 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ExtensionRangeOptions.scala @@ -64,28 +64,7 @@ final case class ExtensionRangeOptions( object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = { - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ExtensionRangeOptions( - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ExtensionRangeOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ExtensionRangeOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -108,6 +87,46 @@ object ExtensionRangeOptions extends scalapb.GeneratedMessageCompanion[com.googl lazy val defaultInstance = com.google.protobuf.descriptor.ExtensionRangeOptions( uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ExtensionRangeOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ExtensionRangeOptions = { + com.google.protobuf.descriptor.ExtensionRangeOptions( + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ExtensionRangeOptions, com.google.protobuf.descriptor.ExtensionRangeOptions.Builder] { + def apply(): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ExtensionRangeOptions): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ExtensionRangeOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ExtensionRangeOptions): Builder = com.google.protobuf.descriptor.ExtensionRangeOptions.Builder(a) implicit class ExtensionRangeOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ExtensionRangeOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ExtensionRangeOptions](_l) { def uninterpretedOption: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]] = field(_.uninterpretedOption)((c_, f_) => c_.copy(uninterpretedOption = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala index a37074cd2..67548ce7e 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldDescriptorProto.scala @@ -215,64 +215,7 @@ final case class FieldDescriptorProto( object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = { - var __name = `_message__`.name - var __number = `_message__`.number - var __label = `_message__`.label - var __type = `_message__`.`type` - var __typeName = `_message__`.typeName - var __extendee = `_message__`.extendee - var __defaultValue = `_message__`.defaultValue - var __oneofIndex = `_message__`.oneofIndex - var __jsonName = `_message__`.jsonName - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 24 => - __number = Option(_input__.readInt32()) - case 32 => - __label = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Label.fromValue(_input__.readEnum())) - case 40 => - __type = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Type.fromValue(_input__.readEnum())) - case 50 => - __typeName = Option(_input__.readStringRequireUtf8()) - case 18 => - __extendee = Option(_input__.readStringRequireUtf8()) - case 58 => - __defaultValue = Option(_input__.readStringRequireUtf8()) - case 72 => - __oneofIndex = Option(_input__.readInt32()) - case 82 => - __jsonName = Option(_input__.readStringRequireUtf8()) - case 66 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FieldDescriptorProto( - name = __name, - number = __number, - label = __label, - `type` = __type, - typeName = __typeName, - extendee = __extendee, - defaultValue = __defaultValue, - oneofIndex = __oneofIndex, - jsonName = __jsonName, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -318,6 +261,100 @@ object FieldDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google jsonName = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __number: _root_.scala.Option[_root_.scala.Int], + private var __label: _root_.scala.Option[com.google.protobuf.descriptor.FieldDescriptorProto.Label], + private var __type: _root_.scala.Option[com.google.protobuf.descriptor.FieldDescriptorProto.Type], + private var __typeName: _root_.scala.Option[_root_.scala.Predef.String], + private var __extendee: _root_.scala.Option[_root_.scala.Predef.String], + private var __defaultValue: _root_.scala.Option[_root_.scala.Predef.String], + private var __oneofIndex: _root_.scala.Option[_root_.scala.Int], + private var __jsonName: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 24 => + __number = Option(_input__.readInt32()) + case 32 => + __label = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Label.fromValue(_input__.readEnum())) + case 40 => + __type = Option(com.google.protobuf.descriptor.FieldDescriptorProto.Type.fromValue(_input__.readEnum())) + case 50 => + __typeName = Option(_input__.readStringRequireUtf8()) + case 18 => + __extendee = Option(_input__.readStringRequireUtf8()) + case 58 => + __defaultValue = Option(_input__.readStringRequireUtf8()) + case 72 => + __oneofIndex = Option(_input__.readInt32()) + case 82 => + __jsonName = Option(_input__.readStringRequireUtf8()) + case 66 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FieldOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FieldDescriptorProto = { + com.google.protobuf.descriptor.FieldDescriptorProto( + name = __name, + number = __number, + label = __label, + `type` = __type, + typeName = __typeName, + extendee = __extendee, + defaultValue = __defaultValue, + oneofIndex = __oneofIndex, + jsonName = __jsonName, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FieldDescriptorProto, com.google.protobuf.descriptor.FieldDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __number = _root_.scala.None, + __label = _root_.scala.None, + __type = _root_.scala.None, + __typeName = _root_.scala.None, + __extendee = _root_.scala.None, + __defaultValue = _root_.scala.None, + __oneofIndex = _root_.scala.None, + __jsonName = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FieldDescriptorProto): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __label = _message__.label, + __type = _message__.`type`, + __typeName = _message__.typeName, + __extendee = _message__.extendee, + __defaultValue = _message__.defaultValue, + __oneofIndex = _message__.oneofIndex, + __jsonName = _message__.jsonName, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FieldDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FieldDescriptorProto): Builder = com.google.protobuf.descriptor.FieldDescriptorProto.Builder(a) sealed abstract class Type(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = Type def isTypeDouble: _root_.scala.Boolean = false diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala index a0970c3f5..08da04ab4 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FieldOptions.scala @@ -207,52 +207,7 @@ final case class FieldOptions( object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FieldOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = { - var __ctype = `_message__`.ctype - var __packed = `_message__`.packed - var __jstype = `_message__`.jstype - var __lazy = `_message__`.`lazy` - var __deprecated = `_message__`.deprecated - var __weak = `_message__`.weak - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __ctype = Option(com.google.protobuf.descriptor.FieldOptions.CType.fromValue(_input__.readEnum())) - case 16 => - __packed = Option(_input__.readBool()) - case 48 => - __jstype = Option(com.google.protobuf.descriptor.FieldOptions.JSType.fromValue(_input__.readEnum())) - case 40 => - __lazy = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 80 => - __weak = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FieldOptions( - ctype = __ctype, - packed = __packed, - jstype = __jstype, - `lazy` = __lazy, - deprecated = __deprecated, - weak = __weak, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FieldOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FieldOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -292,6 +247,82 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu weak = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __ctype: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions.CType], + private var __packed: _root_.scala.Option[_root_.scala.Boolean], + private var __jstype: _root_.scala.Option[com.google.protobuf.descriptor.FieldOptions.JSType], + private var __lazy: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __weak: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FieldOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __ctype = Option(com.google.protobuf.descriptor.FieldOptions.CType.fromValue(_input__.readEnum())) + case 16 => + __packed = Option(_input__.readBool()) + case 48 => + __jstype = Option(com.google.protobuf.descriptor.FieldOptions.JSType.fromValue(_input__.readEnum())) + case 40 => + __lazy = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 80 => + __weak = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FieldOptions = { + com.google.protobuf.descriptor.FieldOptions( + ctype = __ctype, + packed = __packed, + jstype = __jstype, + `lazy` = __lazy, + deprecated = __deprecated, + weak = __weak, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FieldOptions, com.google.protobuf.descriptor.FieldOptions.Builder] { + def apply(): Builder = new Builder( + __ctype = _root_.scala.None, + __packed = _root_.scala.None, + __jstype = _root_.scala.None, + __lazy = _root_.scala.None, + __deprecated = _root_.scala.None, + __weak = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FieldOptions): Builder = new Builder( + __ctype = _message__.ctype, + __packed = _message__.packed, + __jstype = _message__.jstype, + __lazy = _message__.`lazy`, + __deprecated = _message__.deprecated, + __weak = _message__.weak, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FieldOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FieldOptions): Builder = com.google.protobuf.descriptor.FieldOptions.Builder(a) sealed abstract class CType(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = CType def isString: _root_.scala.Boolean = false diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala index 8863b3240..9ab0ee125 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorProto.scala @@ -255,88 +255,7 @@ final case class FileDescriptorProto( object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = { - var __name = `_message__`.name - var __package = `_message__`.`package` - val __dependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.dependency) - val __publicDependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.publicDependency) - val __weakDependency = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.weakDependency) - val __messageType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= `_message__`.messageType) - val __enumType = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= `_message__`.enumType) - val __service = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] ++= `_message__`.service) - val __extension = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= `_message__`.extension) - var __options = `_message__`.options - var __sourceCodeInfo = `_message__`.sourceCodeInfo - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __package = Option(_input__.readStringRequireUtf8()) - case 26 => - __dependency += _input__.readStringRequireUtf8() - case 80 => - __publicDependency += _input__.readInt32() - case 82 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __publicDependency += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 88 => - __weakDependency += _input__.readInt32() - case 90 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __weakDependency += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 34 => - __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) - case 42 => - __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) - case 50 => - __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance) - case 58 => - __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) - case 66 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance))) - case 74 => - __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance))) - case 98 => - __syntax = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileDescriptorProto( - name = __name, - `package` = __package, - dependency = __dependency.result(), - publicDependency = __publicDependency.result(), - weakDependency = __weakDependency.result(), - messageType = __messageType.result(), - enumType = __enumType.result(), - service = __service.result(), - extension = __extension.result(), - options = __options, - sourceCodeInfo = __sourceCodeInfo, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -386,6 +305,128 @@ object FileDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google. sourceCodeInfo = _root_.scala.None, syntax = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __package: _root_.scala.Option[_root_.scala.Predef.String], + private var __dependency: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __publicDependency: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __weakDependency: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __messageType: collection.mutable.Builder[com.google.protobuf.descriptor.DescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.DescriptorProto]], + private var __enumType: collection.mutable.Builder[com.google.protobuf.descriptor.EnumDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.EnumDescriptorProto]], + private var __service: collection.mutable.Builder[com.google.protobuf.descriptor.ServiceDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.ServiceDescriptorProto]], + private var __extension: collection.mutable.Builder[com.google.protobuf.descriptor.FieldDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FieldDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.FileOptions], + private var __sourceCodeInfo: _root_.scala.Option[com.google.protobuf.descriptor.SourceCodeInfo], + private var __syntax: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __package = Option(_input__.readStringRequireUtf8()) + case 26 => + __dependency += _input__.readStringRequireUtf8() + case 80 => + __publicDependency += _input__.readInt32() + case 82 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __publicDependency += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 88 => + __weakDependency += _input__.readInt32() + case 90 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __weakDependency += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 34 => + __messageType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.DescriptorProto.defaultInstance) + case 42 => + __enumType += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.EnumDescriptorProto.defaultInstance) + case 50 => + __service += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.ServiceDescriptorProto.defaultInstance) + case 58 => + __extension += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FieldDescriptorProto.defaultInstance) + case 66 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.FileOptions.defaultInstance))) + case 74 => + __sourceCodeInfo = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceCodeInfo.getOrElse(com.google.protobuf.descriptor.SourceCodeInfo.defaultInstance))) + case 98 => + __syntax = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileDescriptorProto = { + com.google.protobuf.descriptor.FileDescriptorProto( + name = __name, + `package` = __package, + dependency = __dependency.result(), + publicDependency = __publicDependency.result(), + weakDependency = __weakDependency.result(), + messageType = __messageType.result(), + enumType = __enumType.result(), + service = __service.result(), + extension = __extension.result(), + options = __options, + sourceCodeInfo = __sourceCodeInfo, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileDescriptorProto, com.google.protobuf.descriptor.FileDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __package = _root_.scala.None, + __dependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __publicDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __weakDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __messageType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto], + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto], + __service = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto], + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto], + __options = _root_.scala.None, + __sourceCodeInfo = _root_.scala.None, + __syntax = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileDescriptorProto): Builder = new Builder( + __name = _message__.name, + __package = _message__.`package`, + __dependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.dependency, + __publicDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.publicDependency, + __weakDependency = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.weakDependency, + __messageType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.DescriptorProto] ++= _message__.messageType, + __enumType = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.EnumDescriptorProto] ++= _message__.enumType, + __service = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] ++= _message__.service, + __extension = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FieldDescriptorProto] ++= _message__.extension, + __options = _message__.options, + __sourceCodeInfo = _message__.sourceCodeInfo, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileDescriptorProto): Builder = com.google.protobuf.descriptor.FileDescriptorProto.Builder(a) implicit class FileDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.FileDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.FileDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala index 5eb2ce8ff..e69d98a1a 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileDescriptorSet.scala @@ -64,28 +64,7 @@ final case class FileDescriptorSet( object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileDescriptorSet] = this - def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = { - val __file = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= `_message__`.file) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileDescriptorSet( - file = __file.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileDescriptorSet = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileDescriptorSet] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -108,6 +87,46 @@ object FileDescriptorSet extends scalapb.GeneratedMessageCompanion[com.google.pr lazy val defaultInstance = com.google.protobuf.descriptor.FileDescriptorSet( file = _root_.scala.Seq.empty ) + final class Builder private ( + private var __file: collection.mutable.Builder[com.google.protobuf.descriptor.FileDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileDescriptorSet] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __file += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.FileDescriptorProto.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileDescriptorSet = { + com.google.protobuf.descriptor.FileDescriptorSet( + file = __file.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileDescriptorSet, com.google.protobuf.descriptor.FileDescriptorSet.Builder] { + def apply(): Builder = new Builder( + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileDescriptorSet): Builder = new Builder( + __file = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.FileDescriptorProto] ++= _message__.file, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileDescriptorSet.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileDescriptorSet): Builder = com.google.protobuf.descriptor.FileDescriptorSet.Builder(a) implicit class FileDescriptorSetLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.FileDescriptorSet]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.FileDescriptorSet](_l) { def file: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.FileDescriptorProto]] = field(_.file)((c_, f_) => c_.copy(file = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala index 0b7866ad2..2563cfcf3 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/FileOptions.scala @@ -422,108 +422,7 @@ final case class FileOptions( object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.FileOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.FileOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = { - var __javaPackage = `_message__`.javaPackage - var __javaOuterClassname = `_message__`.javaOuterClassname - var __javaMultipleFiles = `_message__`.javaMultipleFiles - var __javaGenerateEqualsAndHash = `_message__`.javaGenerateEqualsAndHash - var __javaStringCheckUtf8 = `_message__`.javaStringCheckUtf8 - var __optimizeFor = `_message__`.optimizeFor - var __goPackage = `_message__`.goPackage - var __ccGenericServices = `_message__`.ccGenericServices - var __javaGenericServices = `_message__`.javaGenericServices - var __pyGenericServices = `_message__`.pyGenericServices - var __phpGenericServices = `_message__`.phpGenericServices - var __deprecated = `_message__`.deprecated - var __ccEnableArenas = `_message__`.ccEnableArenas - var __objcClassPrefix = `_message__`.objcClassPrefix - var __csharpNamespace = `_message__`.csharpNamespace - var __swiftPrefix = `_message__`.swiftPrefix - var __phpClassPrefix = `_message__`.phpClassPrefix - var __phpNamespace = `_message__`.phpNamespace - var __phpMetadataNamespace = `_message__`.phpMetadataNamespace - var __rubyPackage = `_message__`.rubyPackage - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __javaPackage = Option(_input__.readStringRequireUtf8()) - case 66 => - __javaOuterClassname = Option(_input__.readStringRequireUtf8()) - case 80 => - __javaMultipleFiles = Option(_input__.readBool()) - case 160 => - __javaGenerateEqualsAndHash = Option(_input__.readBool()) - case 216 => - __javaStringCheckUtf8 = Option(_input__.readBool()) - case 72 => - __optimizeFor = Option(com.google.protobuf.descriptor.FileOptions.OptimizeMode.fromValue(_input__.readEnum())) - case 90 => - __goPackage = Option(_input__.readStringRequireUtf8()) - case 128 => - __ccGenericServices = Option(_input__.readBool()) - case 136 => - __javaGenericServices = Option(_input__.readBool()) - case 144 => - __pyGenericServices = Option(_input__.readBool()) - case 336 => - __phpGenericServices = Option(_input__.readBool()) - case 184 => - __deprecated = Option(_input__.readBool()) - case 248 => - __ccEnableArenas = Option(_input__.readBool()) - case 290 => - __objcClassPrefix = Option(_input__.readStringRequireUtf8()) - case 298 => - __csharpNamespace = Option(_input__.readStringRequireUtf8()) - case 314 => - __swiftPrefix = Option(_input__.readStringRequireUtf8()) - case 322 => - __phpClassPrefix = Option(_input__.readStringRequireUtf8()) - case 330 => - __phpNamespace = Option(_input__.readStringRequireUtf8()) - case 354 => - __phpMetadataNamespace = Option(_input__.readStringRequireUtf8()) - case 362 => - __rubyPackage = Option(_input__.readStringRequireUtf8()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.FileOptions( - javaPackage = __javaPackage, - javaOuterClassname = __javaOuterClassname, - javaMultipleFiles = __javaMultipleFiles, - javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash, - javaStringCheckUtf8 = __javaStringCheckUtf8, - optimizeFor = __optimizeFor, - goPackage = __goPackage, - ccGenericServices = __ccGenericServices, - javaGenericServices = __javaGenericServices, - pyGenericServices = __pyGenericServices, - phpGenericServices = __phpGenericServices, - deprecated = __deprecated, - ccEnableArenas = __ccEnableArenas, - objcClassPrefix = __objcClassPrefix, - csharpNamespace = __csharpNamespace, - swiftPrefix = __swiftPrefix, - phpClassPrefix = __phpClassPrefix, - phpNamespace = __phpNamespace, - phpMetadataNamespace = __phpMetadataNamespace, - rubyPackage = __rubyPackage, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.FileOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.FileOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.FileOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -590,6 +489,166 @@ object FileOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf rubyPackage = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __javaPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __javaOuterClassname: _root_.scala.Option[_root_.scala.Predef.String], + private var __javaMultipleFiles: _root_.scala.Option[_root_.scala.Boolean], + private var __javaGenerateEqualsAndHash: _root_.scala.Option[_root_.scala.Boolean], + private var __javaStringCheckUtf8: _root_.scala.Option[_root_.scala.Boolean], + private var __optimizeFor: _root_.scala.Option[com.google.protobuf.descriptor.FileOptions.OptimizeMode], + private var __goPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __ccGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __javaGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __pyGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __phpGenericServices: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __ccEnableArenas: _root_.scala.Option[_root_.scala.Boolean], + private var __objcClassPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __csharpNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __swiftPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpClassPrefix: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __phpMetadataNamespace: _root_.scala.Option[_root_.scala.Predef.String], + private var __rubyPackage: _root_.scala.Option[_root_.scala.Predef.String], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.FileOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __javaPackage = Option(_input__.readStringRequireUtf8()) + case 66 => + __javaOuterClassname = Option(_input__.readStringRequireUtf8()) + case 80 => + __javaMultipleFiles = Option(_input__.readBool()) + case 160 => + __javaGenerateEqualsAndHash = Option(_input__.readBool()) + case 216 => + __javaStringCheckUtf8 = Option(_input__.readBool()) + case 72 => + __optimizeFor = Option(com.google.protobuf.descriptor.FileOptions.OptimizeMode.fromValue(_input__.readEnum())) + case 90 => + __goPackage = Option(_input__.readStringRequireUtf8()) + case 128 => + __ccGenericServices = Option(_input__.readBool()) + case 136 => + __javaGenericServices = Option(_input__.readBool()) + case 144 => + __pyGenericServices = Option(_input__.readBool()) + case 336 => + __phpGenericServices = Option(_input__.readBool()) + case 184 => + __deprecated = Option(_input__.readBool()) + case 248 => + __ccEnableArenas = Option(_input__.readBool()) + case 290 => + __objcClassPrefix = Option(_input__.readStringRequireUtf8()) + case 298 => + __csharpNamespace = Option(_input__.readStringRequireUtf8()) + case 314 => + __swiftPrefix = Option(_input__.readStringRequireUtf8()) + case 322 => + __phpClassPrefix = Option(_input__.readStringRequireUtf8()) + case 330 => + __phpNamespace = Option(_input__.readStringRequireUtf8()) + case 354 => + __phpMetadataNamespace = Option(_input__.readStringRequireUtf8()) + case 362 => + __rubyPackage = Option(_input__.readStringRequireUtf8()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.FileOptions = { + com.google.protobuf.descriptor.FileOptions( + javaPackage = __javaPackage, + javaOuterClassname = __javaOuterClassname, + javaMultipleFiles = __javaMultipleFiles, + javaGenerateEqualsAndHash = __javaGenerateEqualsAndHash, + javaStringCheckUtf8 = __javaStringCheckUtf8, + optimizeFor = __optimizeFor, + goPackage = __goPackage, + ccGenericServices = __ccGenericServices, + javaGenericServices = __javaGenericServices, + pyGenericServices = __pyGenericServices, + phpGenericServices = __phpGenericServices, + deprecated = __deprecated, + ccEnableArenas = __ccEnableArenas, + objcClassPrefix = __objcClassPrefix, + csharpNamespace = __csharpNamespace, + swiftPrefix = __swiftPrefix, + phpClassPrefix = __phpClassPrefix, + phpNamespace = __phpNamespace, + phpMetadataNamespace = __phpMetadataNamespace, + rubyPackage = __rubyPackage, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.FileOptions, com.google.protobuf.descriptor.FileOptions.Builder] { + def apply(): Builder = new Builder( + __javaPackage = _root_.scala.None, + __javaOuterClassname = _root_.scala.None, + __javaMultipleFiles = _root_.scala.None, + __javaGenerateEqualsAndHash = _root_.scala.None, + __javaStringCheckUtf8 = _root_.scala.None, + __optimizeFor = _root_.scala.None, + __goPackage = _root_.scala.None, + __ccGenericServices = _root_.scala.None, + __javaGenericServices = _root_.scala.None, + __pyGenericServices = _root_.scala.None, + __phpGenericServices = _root_.scala.None, + __deprecated = _root_.scala.None, + __ccEnableArenas = _root_.scala.None, + __objcClassPrefix = _root_.scala.None, + __csharpNamespace = _root_.scala.None, + __swiftPrefix = _root_.scala.None, + __phpClassPrefix = _root_.scala.None, + __phpNamespace = _root_.scala.None, + __phpMetadataNamespace = _root_.scala.None, + __rubyPackage = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.FileOptions): Builder = new Builder( + __javaPackage = _message__.javaPackage, + __javaOuterClassname = _message__.javaOuterClassname, + __javaMultipleFiles = _message__.javaMultipleFiles, + __javaGenerateEqualsAndHash = _message__.javaGenerateEqualsAndHash, + __javaStringCheckUtf8 = _message__.javaStringCheckUtf8, + __optimizeFor = _message__.optimizeFor, + __goPackage = _message__.goPackage, + __ccGenericServices = _message__.ccGenericServices, + __javaGenericServices = _message__.javaGenericServices, + __pyGenericServices = _message__.pyGenericServices, + __phpGenericServices = _message__.phpGenericServices, + __deprecated = _message__.deprecated, + __ccEnableArenas = _message__.ccEnableArenas, + __objcClassPrefix = _message__.objcClassPrefix, + __csharpNamespace = _message__.csharpNamespace, + __swiftPrefix = _message__.swiftPrefix, + __phpClassPrefix = _message__.phpClassPrefix, + __phpNamespace = _message__.phpNamespace, + __phpMetadataNamespace = _message__.phpMetadataNamespace, + __rubyPackage = _message__.rubyPackage, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.FileOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.FileOptions): Builder = com.google.protobuf.descriptor.FileOptions.Builder(a) /** Generated classes can be optimized for speed or code size. */ sealed abstract class OptimizeMode(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala index d9a2e76e8..d980662f4 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/GeneratedCodeInfo.scala @@ -69,28 +69,7 @@ final case class GeneratedCodeInfo( object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo] = this - def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = { - val __annotation = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] ++= `_message__`.annotation) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.GeneratedCodeInfo( - annotation = __annotation.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -116,6 +95,46 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr lazy val defaultInstance = com.google.protobuf.descriptor.GeneratedCodeInfo( annotation = _root_.scala.Seq.empty ) + final class Builder private ( + private var __annotation: collection.mutable.Builder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, _root_.scala.Seq[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __annotation += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.GeneratedCodeInfo = { + com.google.protobuf.descriptor.GeneratedCodeInfo( + annotation = __annotation.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo, com.google.protobuf.descriptor.GeneratedCodeInfo.Builder] { + def apply(): Builder = new Builder( + __annotation = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo): Builder = new Builder( + __annotation = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] ++= _message__.annotation, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Builder() + def newBuilder(a: com.google.protobuf.descriptor.GeneratedCodeInfo): Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Builder(a) /** @param path * Identifies the element in the original source .proto file. This field * is formatted the same as SourceCodeInfo.Location.path. @@ -235,48 +254,7 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr object Annotation extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] = this - def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = { - val __path = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.path) - var __sourceFile = `_message__`.sourceFile - var __begin = `_message__`.begin - var __end = `_message__`.end - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __path += _input__.readInt32() - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __path += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 18 => - __sourceFile = Option(_input__.readStringRequireUtf8()) - case 24 => - __begin = Option(_input__.readInt32()) - case 32 => - __end = Option(_input__.readInt32()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation( - path = __path.result(), - sourceFile = __sourceFile, - begin = __begin, - end = __end, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -299,6 +277,72 @@ object GeneratedCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.pr begin = _root_.scala.None, end = _root_.scala.None ) + final class Builder private ( + private var __path: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __sourceFile: _root_.scala.Option[_root_.scala.Predef.String], + private var __begin: _root_.scala.Option[_root_.scala.Int], + private var __end: _root_.scala.Option[_root_.scala.Int], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __path += _input__.readInt32() + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __path += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 18 => + __sourceFile = Option(_input__.readStringRequireUtf8()) + case 24 => + __begin = Option(_input__.readInt32()) + case 32 => + __end = Option(_input__.readInt32()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation = { + com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation( + path = __path.result(), + sourceFile = __sourceFile, + begin = __begin, + end = __end, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder] { + def apply(): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __sourceFile = _root_.scala.None, + __begin = _root_.scala.None, + __end = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.path, + __sourceFile = _message__.sourceFile, + __begin = _message__.begin, + __end = _message__.end, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder() + def newBuilder(a: com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation): Builder = com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation.Builder(a) implicit class AnnotationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.GeneratedCodeInfo.Annotation](_l) { def path: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.path)((c_, f_) => c_.copy(path = f_)) def sourceFile: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getSourceFile)((c_, f_) => c_.copy(sourceFile = Option(f_))) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala index f1d06041b..a052ae7d7 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MessageOptions.scala @@ -170,44 +170,7 @@ final case class MessageOptions( object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MessageOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = { - var __messageSetWireFormat = `_message__`.messageSetWireFormat - var __noStandardDescriptorAccessor = `_message__`.noStandardDescriptorAccessor - var __deprecated = `_message__`.deprecated - var __mapEntry = `_message__`.mapEntry - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __messageSetWireFormat = Option(_input__.readBool()) - case 16 => - __noStandardDescriptorAccessor = Option(_input__.readBool()) - case 24 => - __deprecated = Option(_input__.readBool()) - case 56 => - __mapEntry = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MessageOptions( - messageSetWireFormat = __messageSetWireFormat, - noStandardDescriptorAccessor = __noStandardDescriptorAccessor, - deprecated = __deprecated, - mapEntry = __mapEntry, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MessageOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MessageOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -238,6 +201,70 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[com.google.proto mapEntry = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __messageSetWireFormat: _root_.scala.Option[_root_.scala.Boolean], + private var __noStandardDescriptorAccessor: _root_.scala.Option[_root_.scala.Boolean], + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __mapEntry: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MessageOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __messageSetWireFormat = Option(_input__.readBool()) + case 16 => + __noStandardDescriptorAccessor = Option(_input__.readBool()) + case 24 => + __deprecated = Option(_input__.readBool()) + case 56 => + __mapEntry = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MessageOptions = { + com.google.protobuf.descriptor.MessageOptions( + messageSetWireFormat = __messageSetWireFormat, + noStandardDescriptorAccessor = __noStandardDescriptorAccessor, + deprecated = __deprecated, + mapEntry = __mapEntry, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MessageOptions, com.google.protobuf.descriptor.MessageOptions.Builder] { + def apply(): Builder = new Builder( + __messageSetWireFormat = _root_.scala.None, + __noStandardDescriptorAccessor = _root_.scala.None, + __deprecated = _root_.scala.None, + __mapEntry = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MessageOptions): Builder = new Builder( + __messageSetWireFormat = _message__.messageSetWireFormat, + __noStandardDescriptorAccessor = _message__.noStandardDescriptorAccessor, + __deprecated = _message__.deprecated, + __mapEntry = _message__.mapEntry, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MessageOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MessageOptions): Builder = com.google.protobuf.descriptor.MessageOptions.Builder(a) implicit class MessageOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.MessageOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.MessageOptions](_l) { def messageSetWireFormat: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getMessageSetWireFormat)((c_, f_) => c_.copy(messageSetWireFormat = Option(f_))) def optionalMessageSetWireFormat: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.messageSetWireFormat)((c_, f_) => c_.copy(messageSetWireFormat = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala index 222d13710..9411f9aeb 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodDescriptorProto.scala @@ -140,48 +140,7 @@ final case class MethodDescriptorProto( object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = { - var __name = `_message__`.name - var __inputType = `_message__`.inputType - var __outputType = `_message__`.outputType - var __options = `_message__`.options - var __clientStreaming = `_message__`.clientStreaming - var __serverStreaming = `_message__`.serverStreaming - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __inputType = Option(_input__.readStringRequireUtf8()) - case 26 => - __outputType = Option(_input__.readStringRequireUtf8()) - case 34 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance))) - case 40 => - __clientStreaming = Option(_input__.readBool()) - case 48 => - __serverStreaming = Option(_input__.readBool()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MethodDescriptorProto( - name = __name, - inputType = __inputType, - outputType = __outputType, - options = __options, - clientStreaming = __clientStreaming, - serverStreaming = __serverStreaming, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -214,6 +173,76 @@ object MethodDescriptorProto extends scalapb.GeneratedMessageCompanion[com.googl clientStreaming = _root_.scala.None, serverStreaming = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __inputType: _root_.scala.Option[_root_.scala.Predef.String], + private var __outputType: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.MethodOptions], + private var __clientStreaming: _root_.scala.Option[_root_.scala.Boolean], + private var __serverStreaming: _root_.scala.Option[_root_.scala.Boolean], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __inputType = Option(_input__.readStringRequireUtf8()) + case 26 => + __outputType = Option(_input__.readStringRequireUtf8()) + case 34 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.MethodOptions.defaultInstance))) + case 40 => + __clientStreaming = Option(_input__.readBool()) + case 48 => + __serverStreaming = Option(_input__.readBool()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MethodDescriptorProto = { + com.google.protobuf.descriptor.MethodDescriptorProto( + name = __name, + inputType = __inputType, + outputType = __outputType, + options = __options, + clientStreaming = __clientStreaming, + serverStreaming = __serverStreaming, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MethodDescriptorProto, com.google.protobuf.descriptor.MethodDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __inputType = _root_.scala.None, + __outputType = _root_.scala.None, + __options = _root_.scala.None, + __clientStreaming = _root_.scala.None, + __serverStreaming = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MethodDescriptorProto): Builder = new Builder( + __name = _message__.name, + __inputType = _message__.inputType, + __outputType = _message__.outputType, + __options = _message__.options, + __clientStreaming = _message__.clientStreaming, + __serverStreaming = _message__.serverStreaming, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MethodDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MethodDescriptorProto): Builder = com.google.protobuf.descriptor.MethodDescriptorProto.Builder(a) implicit class MethodDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.MethodDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.MethodDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala index 315e3c68f..bd181e2f9 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/MethodOptions.scala @@ -97,36 +97,7 @@ final case class MethodOptions( object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.MethodOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.MethodOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = { - var __deprecated = `_message__`.deprecated - var __idempotencyLevel = `_message__`.idempotencyLevel - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 264 => - __deprecated = Option(_input__.readBool()) - case 272 => - __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum())) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.MethodOptions( - deprecated = __deprecated, - idempotencyLevel = __idempotencyLevel, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.MethodOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.MethodOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.MethodOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -157,6 +128,58 @@ object MethodOptions extends scalapb.GeneratedMessageCompanion[com.google.protob idempotencyLevel = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __idempotencyLevel: _root_.scala.Option[com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.MethodOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 264 => + __deprecated = Option(_input__.readBool()) + case 272 => + __idempotencyLevel = Option(com.google.protobuf.descriptor.MethodOptions.IdempotencyLevel.fromValue(_input__.readEnum())) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.MethodOptions = { + com.google.protobuf.descriptor.MethodOptions( + deprecated = __deprecated, + idempotencyLevel = __idempotencyLevel, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.MethodOptions, com.google.protobuf.descriptor.MethodOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __idempotencyLevel = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.MethodOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __idempotencyLevel = _message__.idempotencyLevel, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.MethodOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.MethodOptions): Builder = com.google.protobuf.descriptor.MethodOptions.Builder(a) /** Is this method side-effect-free (or safe in HTTP parlance), or idempotent, * or neither? HTTP based RPC implementation may choose GET verb for safe * methods, and PUT verb for idempotent methods instead of the default POST. diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala index 25ab86c39..8a5996d63 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofDescriptorProto.scala @@ -76,32 +76,7 @@ final case class OneofDescriptorProto( object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = { - var __name = `_message__`.name - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.OneofDescriptorProto( - name = __name, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -126,6 +101,52 @@ object OneofDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google name = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.OneofOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.OneofDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.OneofOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.OneofDescriptorProto = { + com.google.protobuf.descriptor.OneofDescriptorProto( + name = __name, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.OneofDescriptorProto, com.google.protobuf.descriptor.OneofDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.OneofDescriptorProto): Builder = new Builder( + __name = _message__.name, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.OneofDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.OneofDescriptorProto): Builder = com.google.protobuf.descriptor.OneofDescriptorProto.Builder(a) implicit class OneofDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.OneofDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.OneofDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala index 8f6a04c6e..bc98728ee 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/OneofOptions.scala @@ -64,28 +64,7 @@ final case class OneofOptions( object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.OneofOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = { - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.OneofOptions( - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.OneofOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.OneofOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -108,6 +87,46 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[com.google.protobu lazy val defaultInstance = com.google.protobuf.descriptor.OneofOptions( uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.OneofOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.OneofOptions = { + com.google.protobuf.descriptor.OneofOptions( + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.OneofOptions, com.google.protobuf.descriptor.OneofOptions.Builder] { + def apply(): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.OneofOptions): Builder = new Builder( + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.OneofOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.OneofOptions): Builder = com.google.protobuf.descriptor.OneofOptions.Builder(a) implicit class OneofOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.OneofOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.OneofOptions](_l) { def uninterpretedOption: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]] = field(_.uninterpretedOption)((c_, f_) => c_.copy(uninterpretedOption = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala index 9a301299d..04819d6d2 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceDescriptorProto.scala @@ -93,36 +93,7 @@ final case class ServiceDescriptorProto( object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto] = this - def merge(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = { - var __name = `_message__`.name - val __method = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] ++= `_message__`.method) - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = Option(_input__.readStringRequireUtf8()) - case 18 => - __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance) - case 26 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ServiceDescriptorProto( - name = __name, - method = __method.result(), - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceDescriptorProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceDescriptorProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -150,6 +121,58 @@ object ServiceDescriptorProto extends scalapb.GeneratedMessageCompanion[com.goog method = _root_.scala.Seq.empty, options = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Option[_root_.scala.Predef.String], + private var __method: collection.mutable.Builder[com.google.protobuf.descriptor.MethodDescriptorProto, _root_.scala.Seq[com.google.protobuf.descriptor.MethodDescriptorProto]], + private var __options: _root_.scala.Option[com.google.protobuf.descriptor.ServiceOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ServiceDescriptorProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = Option(_input__.readStringRequireUtf8()) + case 18 => + __method += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.MethodDescriptorProto.defaultInstance) + case 26 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(com.google.protobuf.descriptor.ServiceOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ServiceDescriptorProto = { + com.google.protobuf.descriptor.ServiceDescriptorProto( + name = __name, + method = __method.result(), + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ServiceDescriptorProto, com.google.protobuf.descriptor.ServiceDescriptorProto.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.None, + __method = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto], + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ServiceDescriptorProto): Builder = new Builder( + __name = _message__.name, + __method = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.MethodDescriptorProto] ++= _message__.method, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ServiceDescriptorProto.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ServiceDescriptorProto): Builder = com.google.protobuf.descriptor.ServiceDescriptorProto.Builder(a) implicit class ServiceDescriptorProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ServiceDescriptorProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ServiceDescriptorProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getName)((c_, f_) => c_.copy(name = Option(f_))) def optionalName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala index 118a9350e..a77555537 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/ServiceOptions.scala @@ -83,32 +83,7 @@ final case class ServiceOptions( object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.ServiceOptions] = this - def merge(`_message__`: com.google.protobuf.descriptor.ServiceOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = { - var __deprecated = `_message__`.deprecated - val __uninterpretedOption = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= `_message__`.uninterpretedOption) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 264 => - __deprecated = Option(_input__.readBool()) - case 7994 => - __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.ServiceOptions( - deprecated = __deprecated, - uninterpretedOption = __uninterpretedOption.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.ServiceOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.ServiceOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.ServiceOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -133,6 +108,52 @@ object ServiceOptions extends scalapb.GeneratedMessageCompanion[com.google.proto deprecated = _root_.scala.None, uninterpretedOption = _root_.scala.Seq.empty ) + final class Builder private ( + private var __deprecated: _root_.scala.Option[_root_.scala.Boolean], + private var __uninterpretedOption: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.ServiceOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 264 => + __deprecated = Option(_input__.readBool()) + case 7994 => + __uninterpretedOption += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.ServiceOptions = { + com.google.protobuf.descriptor.ServiceOptions( + deprecated = __deprecated, + uninterpretedOption = __uninterpretedOption.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.ServiceOptions, com.google.protobuf.descriptor.ServiceOptions.Builder] { + def apply(): Builder = new Builder( + __deprecated = _root_.scala.None, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.ServiceOptions): Builder = new Builder( + __deprecated = _message__.deprecated, + __uninterpretedOption = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption] ++= _message__.uninterpretedOption, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.ServiceOptions.Builder() + def newBuilder(a: com.google.protobuf.descriptor.ServiceOptions): Builder = com.google.protobuf.descriptor.ServiceOptions.Builder(a) implicit class ServiceOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.ServiceOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.ServiceOptions](_l) { def deprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getDeprecated)((c_, f_) => c_.copy(deprecated = Option(f_))) def optionalDeprecated: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.deprecated)((c_, f_) => c_.copy(deprecated = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala index 617868fd4..bb20d348f 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/SourceCodeInfo.scala @@ -109,28 +109,7 @@ final case class SourceCodeInfo( object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo] = this - def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = { - val __location = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] ++= `_message__`.location) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.SourceCodeInfo( - location = __location.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -156,6 +135,46 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto lazy val defaultInstance = com.google.protobuf.descriptor.SourceCodeInfo( location = _root_.scala.Seq.empty ) + final class Builder private ( + private var __location: collection.mutable.Builder[com.google.protobuf.descriptor.SourceCodeInfo.Location, _root_.scala.Seq[com.google.protobuf.descriptor.SourceCodeInfo.Location]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.SourceCodeInfo] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __location += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.SourceCodeInfo.Location.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.SourceCodeInfo = { + com.google.protobuf.descriptor.SourceCodeInfo( + location = __location.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.SourceCodeInfo, com.google.protobuf.descriptor.SourceCodeInfo.Builder] { + def apply(): Builder = new Builder( + __location = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo): Builder = new Builder( + __location = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] ++= _message__.location, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.SourceCodeInfo.Builder() + def newBuilder(a: com.google.protobuf.descriptor.SourceCodeInfo): Builder = com.google.protobuf.descriptor.SourceCodeInfo.Builder(a) /** @param path * Identifies which part of the FileDescriptorProto was defined at this * location. @@ -367,60 +386,7 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto object Location extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location] = this - def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = { - val __path = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.path) - val __span = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= `_message__`.span) - var __leadingComments = `_message__`.leadingComments - var __trailingComments = `_message__`.trailingComments - val __leadingDetachedComments = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.leadingDetachedComments) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __path += _input__.readInt32() - case 10 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __path += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 16 => - __span += _input__.readInt32() - case 18 => { - val length = _input__.readRawVarint32() - val oldLimit = _input__.pushLimit(length) - while (_input__.getBytesUntilLimit > 0) { - __span += _input__.readInt32 - } - _input__.popLimit(oldLimit) - } - case 26 => - __leadingComments = Option(_input__.readStringRequireUtf8()) - case 34 => - __trailingComments = Option(_input__.readStringRequireUtf8()) - case 50 => - __leadingDetachedComments += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.SourceCodeInfo.Location( - path = __path.result(), - span = __span.result(), - leadingComments = __leadingComments, - trailingComments = __trailingComments, - leadingDetachedComments = __leadingDetachedComments.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.SourceCodeInfo.Location = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.SourceCodeInfo.Location] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -445,6 +411,86 @@ object SourceCodeInfo extends scalapb.GeneratedMessageCompanion[com.google.proto trailingComments = _root_.scala.None, leadingDetachedComments = _root_.scala.Seq.empty ) + final class Builder private ( + private var __path: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __span: collection.mutable.Builder[_root_.scala.Int, _root_.scala.Seq[_root_.scala.Int]], + private var __leadingComments: _root_.scala.Option[_root_.scala.Predef.String], + private var __trailingComments: _root_.scala.Option[_root_.scala.Predef.String], + private var __leadingDetachedComments: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.SourceCodeInfo.Location] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __path += _input__.readInt32() + case 10 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __path += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 16 => + __span += _input__.readInt32() + case 18 => { + val length = _input__.readRawVarint32() + val oldLimit = _input__.pushLimit(length) + while (_input__.getBytesUntilLimit > 0) { + __span += _input__.readInt32 + } + _input__.popLimit(oldLimit) + } + case 26 => + __leadingComments = Option(_input__.readStringRequireUtf8()) + case 34 => + __trailingComments = Option(_input__.readStringRequireUtf8()) + case 50 => + __leadingDetachedComments += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.SourceCodeInfo.Location = { + com.google.protobuf.descriptor.SourceCodeInfo.Location( + path = __path.result(), + span = __span.result(), + leadingComments = __leadingComments, + trailingComments = __trailingComments, + leadingDetachedComments = __leadingDetachedComments.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.SourceCodeInfo.Location, com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder] { + def apply(): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __span = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int], + __leadingComments = _root_.scala.None, + __trailingComments = _root_.scala.None, + __leadingDetachedComments = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.SourceCodeInfo.Location): Builder = new Builder( + __path = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.path, + __span = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Int] ++= _message__.span, + __leadingComments = _message__.leadingComments, + __trailingComments = _message__.trailingComments, + __leadingDetachedComments = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.leadingDetachedComments, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder() + def newBuilder(a: com.google.protobuf.descriptor.SourceCodeInfo.Location): Builder = com.google.protobuf.descriptor.SourceCodeInfo.Location.Builder(a) implicit class LocationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.SourceCodeInfo.Location]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.SourceCodeInfo.Location](_l) { def path: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.path)((c_, f_) => c_.copy(path = f_)) def span: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Int]] = field(_.span)((c_, f_) => c_.copy(span = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala index ce4b947a6..c3f7608a5 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/descriptor/UninterpretedOption.scala @@ -156,52 +156,7 @@ final case class UninterpretedOption( object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption] = this - def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = { - val __name = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] ++= `_message__`.name) - var __identifierValue = `_message__`.identifierValue - var __positiveIntValue = `_message__`.positiveIntValue - var __negativeIntValue = `_message__`.negativeIntValue - var __doubleValue = `_message__`.doubleValue - var __stringValue = `_message__`.stringValue - var __aggregateValue = `_message__`.aggregateValue - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 18 => - __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance) - case 26 => - __identifierValue = Option(_input__.readStringRequireUtf8()) - case 32 => - __positiveIntValue = Option(_input__.readUInt64()) - case 40 => - __negativeIntValue = Option(_input__.readInt64()) - case 49 => - __doubleValue = Option(_input__.readDouble()) - case 58 => - __stringValue = Option(_input__.readBytes()) - case 66 => - __aggregateValue = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.descriptor.UninterpretedOption( - name = __name.result(), - identifierValue = __identifierValue, - positiveIntValue = __positiveIntValue, - negativeIntValue = __negativeIntValue, - doubleValue = __doubleValue, - stringValue = __stringValue, - aggregateValue = __aggregateValue, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -239,6 +194,82 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. stringValue = _root_.scala.None, aggregateValue = _root_.scala.None ) + final class Builder private ( + private var __name: collection.mutable.Builder[com.google.protobuf.descriptor.UninterpretedOption.NamePart, _root_.scala.Seq[com.google.protobuf.descriptor.UninterpretedOption.NamePart]], + private var __identifierValue: _root_.scala.Option[_root_.scala.Predef.String], + private var __positiveIntValue: _root_.scala.Option[_root_.scala.Long], + private var __negativeIntValue: _root_.scala.Option[_root_.scala.Long], + private var __doubleValue: _root_.scala.Option[_root_.scala.Double], + private var __stringValue: _root_.scala.Option[_root_.com.google.protobuf.ByteString], + private var __aggregateValue: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.UninterpretedOption] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 18 => + __name += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.descriptor.UninterpretedOption.NamePart.defaultInstance) + case 26 => + __identifierValue = Option(_input__.readStringRequireUtf8()) + case 32 => + __positiveIntValue = Option(_input__.readUInt64()) + case 40 => + __negativeIntValue = Option(_input__.readInt64()) + case 49 => + __doubleValue = Option(_input__.readDouble()) + case 58 => + __stringValue = Option(_input__.readBytes()) + case 66 => + __aggregateValue = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.UninterpretedOption = { + com.google.protobuf.descriptor.UninterpretedOption( + name = __name.result(), + identifierValue = __identifierValue, + positiveIntValue = __positiveIntValue, + negativeIntValue = __negativeIntValue, + doubleValue = __doubleValue, + stringValue = __stringValue, + aggregateValue = __aggregateValue, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.UninterpretedOption, com.google.protobuf.descriptor.UninterpretedOption.Builder] { + def apply(): Builder = new Builder( + __name = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart], + __identifierValue = _root_.scala.None, + __positiveIntValue = _root_.scala.None, + __negativeIntValue = _root_.scala.None, + __doubleValue = _root_.scala.None, + __stringValue = _root_.scala.None, + __aggregateValue = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.UninterpretedOption): Builder = new Builder( + __name = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] ++= _message__.name, + __identifierValue = _message__.identifierValue, + __positiveIntValue = _message__.positiveIntValue, + __negativeIntValue = _message__.negativeIntValue, + __doubleValue = _message__.doubleValue, + __stringValue = _message__.stringValue, + __aggregateValue = _message__.aggregateValue, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.UninterpretedOption.Builder() + def newBuilder(a: com.google.protobuf.descriptor.UninterpretedOption): Builder = com.google.protobuf.descriptor.UninterpretedOption.Builder(a) /** The name of the uninterpreted option. Each string represents a segment in * a dot-separated name. is_extension is true iff a segment represents an * extension (denoted with parentheses in options specs in .proto files). @@ -312,36 +343,7 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. object NamePart extends scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart] = this - def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = { - var __namePart = `_message__`.namePart - var __isExtension = `_message__`.isExtension - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var __requiredFields0: _root_.scala.Long = 0x3L - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __namePart = _input__.readStringRequireUtf8() - __requiredFields0 &= 0xfffffffffffffffeL - case 16 => - __isExtension = _input__.readBool() - __requiredFields0 &= 0xfffffffffffffffdL - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } - com.google.protobuf.descriptor.UninterpretedOption.NamePart( - namePart = __namePart, - isExtension = __isExtension, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.descriptor.UninterpretedOption.NamePart = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.descriptor.UninterpretedOption.NamePart] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -360,6 +362,56 @@ object UninterpretedOption extends scalapb.GeneratedMessageCompanion[com.google. namePart = "", isExtension = false ) + final class Builder private ( + private var __namePart: _root_.scala.Predef.String, + private var __isExtension: _root_.scala.Boolean, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.descriptor.UninterpretedOption.NamePart] { + private var __requiredFields0: _root_.scala.Long = 0x3L + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __namePart = _input__.readStringRequireUtf8() + __requiredFields0 &= 0xfffffffffffffffeL + case 16 => + __isExtension = _input__.readBool() + __requiredFields0 &= 0xfffffffffffffffdL + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.descriptor.UninterpretedOption.NamePart = { + if (__requiredFields0 != 0L) { throw new _root_.com.google.protobuf.InvalidProtocolBufferException("Message missing required fields.") } + com.google.protobuf.descriptor.UninterpretedOption.NamePart( + namePart = __namePart, + isExtension = __isExtension, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.descriptor.UninterpretedOption.NamePart, com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder] { + def apply(): Builder = new Builder( + __namePart = "", + __isExtension = false, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.descriptor.UninterpretedOption.NamePart): Builder = new Builder( + __namePart = _message__.namePart, + __isExtension = _message__.isExtension, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder() + def newBuilder(a: com.google.protobuf.descriptor.UninterpretedOption.NamePart): Builder = com.google.protobuf.descriptor.UninterpretedOption.NamePart.Builder(a) implicit class NamePartLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.descriptor.UninterpretedOption.NamePart]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.descriptor.UninterpretedOption.NamePart](_l) { def namePart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.namePart)((c_, f_) => c_.copy(namePart = f_)) def isExtension: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.isExtension)((c_, f_) => c_.copy(isExtension = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala index 440744ea6..f227a71a4 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/duration/Duration.scala @@ -155,32 +155,7 @@ final case class Duration( object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.DurationCompanionMethods { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.duration.Duration] with scalapb.DurationCompanionMethods = this - def merge(`_message__`: com.google.protobuf.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = { - var __seconds = `_message__`.seconds - var __nanos = `_message__`.nanos - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __seconds = _input__.readInt64() - case 16 => - __nanos = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.duration.Duration( - seconds = __seconds, - nanos = __nanos, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.duration.Duration, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.duration.Duration = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.duration.Duration] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -199,6 +174,52 @@ object Duration extends scalapb.GeneratedMessageCompanion[com.google.protobuf.du seconds = 0L, nanos = 0 ) + final class Builder private ( + private var __seconds: _root_.scala.Long, + private var __nanos: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.duration.Duration] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __seconds = _input__.readInt64() + case 16 => + __nanos = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.duration.Duration = { + com.google.protobuf.duration.Duration( + seconds = __seconds, + nanos = __nanos, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.duration.Duration, com.google.protobuf.duration.Duration.Builder] { + def apply(): Builder = new Builder( + __seconds = 0L, + __nanos = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.duration.Duration): Builder = new Builder( + __seconds = _message__.seconds, + __nanos = _message__.nanos, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.duration.Duration.Builder() + def newBuilder(a: com.google.protobuf.duration.Duration): Builder = com.google.protobuf.duration.Duration.Builder(a) implicit class DurationLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.duration.Duration]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.duration.Duration](_l) { def seconds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.seconds)((c_, f_) => c_.copy(seconds = f_)) def nanos: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.nanos)((c_, f_) => c_.copy(nanos = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala index d71eeb4de..ed42acfb1 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/empty/Empty.scala @@ -47,24 +47,7 @@ final case class Empty( object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.empty.Empty] = this - def merge(`_message__`: com.google.protobuf.empty.Empty, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = { - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.empty.Empty( - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.empty.Empty, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.empty.Empty = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.empty.Empty] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -79,6 +62,40 @@ object Empty extends scalapb.GeneratedMessageCompanion[com.google.protobuf.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) lazy val defaultInstance = com.google.protobuf.empty.Empty( ) + final class Builder private ( + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.empty.Empty] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.empty.Empty = { + com.google.protobuf.empty.Empty( + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.empty.Empty, com.google.protobuf.empty.Empty.Builder] { + def apply(): Builder = new Builder( + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.empty.Empty): Builder = new Builder( + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.empty.Empty.Builder() + def newBuilder(a: com.google.protobuf.empty.Empty): Builder = com.google.protobuf.empty.Empty.Builder(a) implicit class EmptyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.empty.Empty]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.empty.Empty](_l) { } def of( diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala index 493250583..c29a03bc0 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/field_mask/FieldMask.scala @@ -262,28 +262,7 @@ final case class FieldMask( object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.field_mask.FieldMask] = this - def merge(`_message__`: com.google.protobuf.field_mask.FieldMask, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = { - val __paths = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.paths) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __paths += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.field_mask.FieldMask( - paths = __paths.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.field_mask.FieldMask, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.field_mask.FieldMask = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.field_mask.FieldMask] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -300,6 +279,46 @@ object FieldMask extends scalapb.GeneratedMessageCompanion[com.google.protobuf.f lazy val defaultInstance = com.google.protobuf.field_mask.FieldMask( paths = _root_.scala.Seq.empty ) + final class Builder private ( + private var __paths: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.field_mask.FieldMask] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __paths += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.field_mask.FieldMask = { + com.google.protobuf.field_mask.FieldMask( + paths = __paths.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.field_mask.FieldMask, com.google.protobuf.field_mask.FieldMask.Builder] { + def apply(): Builder = new Builder( + __paths = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.field_mask.FieldMask): Builder = new Builder( + __paths = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.paths, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.field_mask.FieldMask.Builder() + def newBuilder(a: com.google.protobuf.field_mask.FieldMask): Builder = com.google.protobuf.field_mask.FieldMask.Builder(a) implicit class FieldMaskLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.field_mask.FieldMask]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.field_mask.FieldMask](_l) { def paths: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.paths)((c_, f_) => c_.copy(paths = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala index b9f8d09f4..9ad2a6f6e 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/source_context/SourceContext.scala @@ -71,28 +71,7 @@ final case class SourceContext( object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.source_context.SourceContext] = this - def merge(`_message__`: com.google.protobuf.source_context.SourceContext, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = { - var __fileName = `_message__`.fileName - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fileName = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.source_context.SourceContext( - fileName = __fileName, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.source_context.SourceContext, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.source_context.SourceContext = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.source_context.SourceContext] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object SourceContext extends scalapb.GeneratedMessageCompanion[com.google.protob lazy val defaultInstance = com.google.protobuf.source_context.SourceContext( fileName = "" ) + final class Builder private ( + private var __fileName: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.source_context.SourceContext] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fileName = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.source_context.SourceContext = { + com.google.protobuf.source_context.SourceContext( + fileName = __fileName, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.source_context.SourceContext, com.google.protobuf.source_context.SourceContext.Builder] { + def apply(): Builder = new Builder( + __fileName = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.source_context.SourceContext): Builder = new Builder( + __fileName = _message__.fileName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.source_context.SourceContext.Builder() + def newBuilder(a: com.google.protobuf.source_context.SourceContext): Builder = com.google.protobuf.source_context.SourceContext.Builder(a) implicit class SourceContextLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.source_context.SourceContext]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.source_context.SourceContext](_l) { def fileName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.fileName)((c_, f_) => c_.copy(fileName = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala index 7a46ebed6..ddeaf31db 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/ListValue.scala @@ -68,28 +68,7 @@ final case class ListValue( object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.ListValue] = this - def merge(`_message__`: com.google.protobuf.struct.ListValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = { - val __values = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value] ++= `_message__`.values) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.ListValue( - values = __values.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.ListValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.ListValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.ListValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -112,6 +91,46 @@ object ListValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.s lazy val defaultInstance = com.google.protobuf.struct.ListValue( values = _root_.scala.Seq.empty ) + final class Builder private ( + private var __values: collection.mutable.Builder[com.google.protobuf.struct.Value, _root_.scala.Seq[com.google.protobuf.struct.Value]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.ListValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __values += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Value.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.ListValue = { + com.google.protobuf.struct.ListValue( + values = __values.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.ListValue, com.google.protobuf.struct.ListValue.Builder] { + def apply(): Builder = new Builder( + __values = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.ListValue): Builder = new Builder( + __values = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.struct.Value] ++= _message__.values, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.ListValue.Builder() + def newBuilder(a: com.google.protobuf.struct.ListValue): Builder = com.google.protobuf.struct.ListValue.Builder(a) implicit class ListValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.ListValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.struct.ListValue](_l) { def values: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.struct.Value]] = field(_.values)((c_, f_) => c_.copy(values = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala index 89252ba17..b53012059 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Struct.scala @@ -73,28 +73,7 @@ final case class Struct( object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct] = this - def merge(`_message__`: com.google.protobuf.struct.Struct, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = { - val __fields = (_root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value] ++= `_message__`.fields) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance)) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Struct( - fields = __fields.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Struct, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -120,6 +99,46 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru lazy val defaultInstance = com.google.protobuf.struct.Struct( fields = _root_.scala.collection.immutable.Map.empty ) + final class Builder private ( + private var __fields: collection.mutable.Builder[(_root_.scala.Predef.String, com.google.protobuf.struct.Value), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, com.google.protobuf.struct.Value]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Struct] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __fields += com.google.protobuf.struct.Struct._typemapper_fields.toCustom(_root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.struct.Struct.FieldsEntry.defaultInstance)) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Struct = { + com.google.protobuf.struct.Struct( + fields = __fields.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Struct, com.google.protobuf.struct.Struct.Builder] { + def apply(): Builder = new Builder( + __fields = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Struct): Builder = new Builder( + __fields = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, com.google.protobuf.struct.Value] ++= _message__.fields, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Struct.Builder() + def newBuilder(a: com.google.protobuf.struct.Struct): Builder = com.google.protobuf.struct.Struct.Builder(a) @SerialVersionUID(0L) final case class FieldsEntry( key: _root_.scala.Predef.String = "", @@ -195,32 +214,7 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru object FieldsEntry extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Struct.FieldsEntry] = this - def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = { - var __key = `_message__`.key - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __key = _input__.readStringRequireUtf8() - case 18 => - __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Struct.FieldsEntry( - key = __key, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Struct.FieldsEntry = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Struct.FieldsEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -245,6 +239,52 @@ object Struct extends scalapb.GeneratedMessageCompanion[com.google.protobuf.stru key = "", value = _root_.scala.None ) + final class Builder private ( + private var __key: _root_.scala.Predef.String, + private var __value: _root_.scala.Option[com.google.protobuf.struct.Value], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Struct.FieldsEntry] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __key = _input__.readStringRequireUtf8() + case 18 => + __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.struct.Value.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Struct.FieldsEntry = { + com.google.protobuf.struct.Struct.FieldsEntry( + key = __key, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Struct.FieldsEntry, com.google.protobuf.struct.Struct.FieldsEntry.Builder] { + def apply(): Builder = new Builder( + __key = "", + __value = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Struct.FieldsEntry): Builder = new Builder( + __key = _message__.key, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Struct.FieldsEntry.Builder() + def newBuilder(a: com.google.protobuf.struct.Struct.FieldsEntry): Builder = com.google.protobuf.struct.Struct.FieldsEntry.Builder(a) implicit class FieldsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct.FieldsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.struct.Struct.FieldsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Value] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala index b9bbb4e5d..f64a1cfb2 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/struct/Value.scala @@ -130,38 +130,7 @@ final case class Value( object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.struct.Value] = this - def merge(`_message__`: com.google.protobuf.struct.Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = { - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var __kind = `_message__`.kind - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __kind = com.google.protobuf.struct.Value.Kind.NullValue(com.google.protobuf.struct.NullValue.fromValue(_input__.readEnum())) - case 17 => - __kind = com.google.protobuf.struct.Value.Kind.NumberValue(_input__.readDouble()) - case 26 => - __kind = com.google.protobuf.struct.Value.Kind.StringValue(_input__.readStringRequireUtf8()) - case 32 => - __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool()) - case 42 => - __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, _message__.kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance))) - case 50 => - __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, _message__.kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.struct.Value( - kind = __kind, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.struct.Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.struct.Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.struct.Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -195,6 +164,56 @@ object Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.struc lazy val defaultInstance = com.google.protobuf.struct.Value( kind = com.google.protobuf.struct.Value.Kind.Empty ) + final class Builder private ( + private var __kind: com.google.protobuf.struct.Value.Kind, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.struct.Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __kind = com.google.protobuf.struct.Value.Kind.NullValue(com.google.protobuf.struct.NullValue.fromValue(_input__.readEnum())) + case 17 => + __kind = com.google.protobuf.struct.Value.Kind.NumberValue(_input__.readDouble()) + case 26 => + __kind = com.google.protobuf.struct.Value.Kind.StringValue(_input__.readStringRequireUtf8()) + case 32 => + __kind = com.google.protobuf.struct.Value.Kind.BoolValue(_input__.readBool()) + case 42 => + __kind = com.google.protobuf.struct.Value.Kind.StructValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.structValue.getOrElse(com.google.protobuf.struct.Struct.defaultInstance))) + case 50 => + __kind = com.google.protobuf.struct.Value.Kind.ListValue(_root_.scalapb.LiteParser.readMessage(_input__, __kind.listValue.getOrElse(com.google.protobuf.struct.ListValue.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.struct.Value = { + com.google.protobuf.struct.Value( + kind = __kind, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.struct.Value, com.google.protobuf.struct.Value.Builder] { + def apply(): Builder = new Builder( + __kind = com.google.protobuf.struct.Value.Kind.Empty, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.struct.Value): Builder = new Builder( + __kind = _message__.kind, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.struct.Value.Builder() + def newBuilder(a: com.google.protobuf.struct.Value): Builder = com.google.protobuf.struct.Value.Builder(a) sealed trait Kind extends _root_.scalapb.GeneratedOneof { def isEmpty: _root_.scala.Boolean = false def isDefined: _root_.scala.Boolean = true diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala index 46ca504de..d5f062369 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/timestamp/Timestamp.scala @@ -175,32 +175,7 @@ final case class Timestamp( object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.TimestampCompanionMethods { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.timestamp.Timestamp] with scalapb.TimestampCompanionMethods = this - def merge(`_message__`: com.google.protobuf.timestamp.Timestamp, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = { - var __seconds = `_message__`.seconds - var __nanos = `_message__`.nanos - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __seconds = _input__.readInt64() - case 16 => - __nanos = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.timestamp.Timestamp( - seconds = __seconds, - nanos = __nanos, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.timestamp.Timestamp, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.timestamp.Timestamp = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.timestamp.Timestamp] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -219,6 +194,52 @@ object Timestamp extends scalapb.GeneratedMessageCompanion[com.google.protobuf.t seconds = 0L, nanos = 0 ) + final class Builder private ( + private var __seconds: _root_.scala.Long, + private var __nanos: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.timestamp.Timestamp] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __seconds = _input__.readInt64() + case 16 => + __nanos = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.timestamp.Timestamp = { + com.google.protobuf.timestamp.Timestamp( + seconds = __seconds, + nanos = __nanos, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.timestamp.Timestamp, com.google.protobuf.timestamp.Timestamp.Builder] { + def apply(): Builder = new Builder( + __seconds = 0L, + __nanos = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.timestamp.Timestamp): Builder = new Builder( + __seconds = _message__.seconds, + __nanos = _message__.nanos, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.timestamp.Timestamp.Builder() + def newBuilder(a: com.google.protobuf.timestamp.Timestamp): Builder = com.google.protobuf.timestamp.Timestamp.Builder(a) implicit class TimestampLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.timestamp.Timestamp]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.timestamp.Timestamp](_l) { def seconds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.seconds)((c_, f_) => c_.copy(seconds = f_)) def nanos: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.nanos)((c_, f_) => c_.copy(nanos = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala index 4bd8505ee..e29c7c060 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Enum.scala @@ -147,44 +147,7 @@ final case class Enum( object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Enum] = this - def merge(`_message__`: com.google.protobuf.`type`.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = { - var __name = `_message__`.name - val __enumvalue = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue] ++= `_message__`.enumvalue) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __sourceContext = `_message__`.sourceContext - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance) - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 34 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 40 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Enum( - name = __name, - enumvalue = __enumvalue.result(), - options = __options.result(), - sourceContext = __sourceContext, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Enum, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Enum = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Enum] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -221,6 +184,70 @@ object Enum extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __enumvalue: collection.mutable.Builder[com.google.protobuf.`type`.EnumValue, _root_.scala.Seq[com.google.protobuf.`type`.EnumValue]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Enum] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __enumvalue += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.EnumValue.defaultInstance) + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 34 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 40 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Enum = { + com.google.protobuf.`type`.Enum( + name = __name, + enumvalue = __enumvalue.result(), + options = __options.result(), + sourceContext = __sourceContext, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Enum, com.google.protobuf.`type`.Enum.Builder] { + def apply(): Builder = new Builder( + __name = "", + __enumvalue = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __sourceContext = _root_.scala.None, + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Enum): Builder = new Builder( + __name = _message__.name, + __enumvalue = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.EnumValue] ++= _message__.enumvalue, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __sourceContext = _message__.sourceContext, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Enum.Builder() + def newBuilder(a: com.google.protobuf.`type`.Enum): Builder = com.google.protobuf.`type`.Enum.Builder(a) implicit class EnumLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.Enum]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.Enum](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def enumvalue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.`type`.EnumValue]] = field(_.enumvalue)((c_, f_) => c_.copy(enumvalue = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala index 136a71c43..1934fb194 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/EnumValue.scala @@ -110,36 +110,7 @@ final case class EnumValue( object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.EnumValue] = this - def merge(`_message__`: com.google.protobuf.`type`.EnumValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = { - var __name = `_message__`.name - var __number = `_message__`.number - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 16 => - __number = _input__.readInt32() - case 26 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.EnumValue( - name = __name, - number = __number, - options = __options.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.EnumValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.EnumValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.EnumValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -166,6 +137,58 @@ object EnumValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.` number = 0, options = _root_.scala.Seq.empty ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __number: _root_.scala.Int, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.EnumValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 16 => + __number = _input__.readInt32() + case 26 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.EnumValue = { + com.google.protobuf.`type`.EnumValue( + name = __name, + number = __number, + options = __options.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.EnumValue, com.google.protobuf.`type`.EnumValue.Builder] { + def apply(): Builder = new Builder( + __name = "", + __number = 0, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.EnumValue): Builder = new Builder( + __name = _message__.name, + __number = _message__.number, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.EnumValue.Builder() + def newBuilder(a: com.google.protobuf.`type`.EnumValue): Builder = com.google.protobuf.`type`.EnumValue.Builder(a) implicit class EnumValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.EnumValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.EnumValue](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def number: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.number)((c_, f_) => c_.copy(number = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala index b5f052b98..1505cc57a 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Field.scala @@ -266,64 +266,7 @@ final case class Field( object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Field] = this - def merge(`_message__`: com.google.protobuf.`type`.Field, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = { - var __kind = `_message__`.kind - var __cardinality = `_message__`.cardinality - var __number = `_message__`.number - var __name = `_message__`.name - var __typeUrl = `_message__`.typeUrl - var __oneofIndex = `_message__`.oneofIndex - var __packed = `_message__`.packed - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __jsonName = `_message__`.jsonName - var __defaultValue = `_message__`.defaultValue - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __kind = com.google.protobuf.`type`.Field.Kind.fromValue(_input__.readEnum()) - case 16 => - __cardinality = com.google.protobuf.`type`.Field.Cardinality.fromValue(_input__.readEnum()) - case 24 => - __number = _input__.readInt32() - case 34 => - __name = _input__.readStringRequireUtf8() - case 50 => - __typeUrl = _input__.readStringRequireUtf8() - case 56 => - __oneofIndex = _input__.readInt32() - case 64 => - __packed = _input__.readBool() - case 74 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 82 => - __jsonName = _input__.readStringRequireUtf8() - case 90 => - __defaultValue = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Field( - kind = __kind, - cardinality = __cardinality, - number = __number, - name = __name, - typeUrl = __typeUrl, - oneofIndex = __oneofIndex, - packed = __packed, - options = __options.result(), - jsonName = __jsonName, - defaultValue = __defaultValue, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Field, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Field = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Field] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -369,6 +312,100 @@ object Field extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type jsonName = "", defaultValue = "" ) + final class Builder private ( + private var __kind: com.google.protobuf.`type`.Field.Kind, + private var __cardinality: com.google.protobuf.`type`.Field.Cardinality, + private var __number: _root_.scala.Int, + private var __name: _root_.scala.Predef.String, + private var __typeUrl: _root_.scala.Predef.String, + private var __oneofIndex: _root_.scala.Int, + private var __packed: _root_.scala.Boolean, + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __jsonName: _root_.scala.Predef.String, + private var __defaultValue: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Field] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __kind = com.google.protobuf.`type`.Field.Kind.fromValue(_input__.readEnum()) + case 16 => + __cardinality = com.google.protobuf.`type`.Field.Cardinality.fromValue(_input__.readEnum()) + case 24 => + __number = _input__.readInt32() + case 34 => + __name = _input__.readStringRequireUtf8() + case 50 => + __typeUrl = _input__.readStringRequireUtf8() + case 56 => + __oneofIndex = _input__.readInt32() + case 64 => + __packed = _input__.readBool() + case 74 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 82 => + __jsonName = _input__.readStringRequireUtf8() + case 90 => + __defaultValue = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Field = { + com.google.protobuf.`type`.Field( + kind = __kind, + cardinality = __cardinality, + number = __number, + name = __name, + typeUrl = __typeUrl, + oneofIndex = __oneofIndex, + packed = __packed, + options = __options.result(), + jsonName = __jsonName, + defaultValue = __defaultValue, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Field, com.google.protobuf.`type`.Field.Builder] { + def apply(): Builder = new Builder( + __kind = com.google.protobuf.`type`.Field.Kind.TYPE_UNKNOWN, + __cardinality = com.google.protobuf.`type`.Field.Cardinality.CARDINALITY_UNKNOWN, + __number = 0, + __name = "", + __typeUrl = "", + __oneofIndex = 0, + __packed = false, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __jsonName = "", + __defaultValue = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Field): Builder = new Builder( + __kind = _message__.kind, + __cardinality = _message__.cardinality, + __number = _message__.number, + __name = _message__.name, + __typeUrl = _message__.typeUrl, + __oneofIndex = _message__.oneofIndex, + __packed = _message__.packed, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __jsonName = _message__.jsonName, + __defaultValue = _message__.defaultValue, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Field.Builder() + def newBuilder(a: com.google.protobuf.`type`.Field): Builder = com.google.protobuf.`type`.Field.Builder(a) /** Basic field types. */ sealed abstract class Kind(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala index d9a33b6ef..7b7bdf27a 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/OptionProto.scala @@ -94,32 +94,7 @@ final case class OptionProto( object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.OptionProto] = this - def merge(`_message__`: com.google.protobuf.`type`.OptionProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = { - var __name = `_message__`.name - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.OptionProto( - name = __name, - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.OptionProto, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.OptionProto = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.OptionProto] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -144,6 +119,52 @@ object OptionProto extends scalapb.GeneratedMessageCompanion[com.google.protobuf name = "", value = _root_.scala.None ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __value: _root_.scala.Option[com.google.protobuf.any.Any], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.OptionProto] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __value = Option(_root_.scalapb.LiteParser.readMessage(_input__, __value.getOrElse(com.google.protobuf.any.Any.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.OptionProto = { + com.google.protobuf.`type`.OptionProto( + name = __name, + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.OptionProto, com.google.protobuf.`type`.OptionProto.Builder] { + def apply(): Builder = new Builder( + __name = "", + __value = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.OptionProto): Builder = new Builder( + __name = _message__.name, + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.OptionProto.Builder() + def newBuilder(a: com.google.protobuf.`type`.OptionProto): Builder = com.google.protobuf.`type`.OptionProto.Builder(a) implicit class OptionProtoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.OptionProto]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.OptionProto](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.any.Any] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala index 34faf5db3..545db5298 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/type/Type.scala @@ -164,48 +164,7 @@ final case class Type( object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.`type`.Type] = this - def merge(`_message__`: com.google.protobuf.`type`.Type, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = { - var __name = `_message__`.name - val __fields = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field] ++= `_message__`.fields) - val __oneofs = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.oneofs) - val __options = (_root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= `_message__`.options) - var __sourceContext = `_message__`.sourceContext - var __syntax = `_message__`.syntax - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __name = _input__.readStringRequireUtf8() - case 18 => - __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance) - case 26 => - __oneofs += _input__.readStringRequireUtf8() - case 34 => - __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) - case 42 => - __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) - case 48 => - __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.`type`.Type( - name = __name, - fields = __fields.result(), - oneofs = __oneofs.result(), - options = __options.result(), - sourceContext = __sourceContext, - syntax = __syntax, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.`type`.Type, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.`type`.Type = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.`type`.Type] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -244,6 +203,76 @@ object Type extends scalapb.GeneratedMessageCompanion[com.google.protobuf.`type` sourceContext = _root_.scala.None, syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2 ) + final class Builder private ( + private var __name: _root_.scala.Predef.String, + private var __fields: collection.mutable.Builder[com.google.protobuf.`type`.Field, _root_.scala.Seq[com.google.protobuf.`type`.Field]], + private var __oneofs: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __options: collection.mutable.Builder[com.google.protobuf.`type`.OptionProto, _root_.scala.Seq[com.google.protobuf.`type`.OptionProto]], + private var __sourceContext: _root_.scala.Option[com.google.protobuf.source_context.SourceContext], + private var __syntax: com.google.protobuf.`type`.Syntax, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.`type`.Type] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __name = _input__.readStringRequireUtf8() + case 18 => + __fields += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.Field.defaultInstance) + case 26 => + __oneofs += _input__.readStringRequireUtf8() + case 34 => + __options += _root_.scalapb.LiteParser.readMessage(_input__, com.google.protobuf.`type`.OptionProto.defaultInstance) + case 42 => + __sourceContext = Option(_root_.scalapb.LiteParser.readMessage(_input__, __sourceContext.getOrElse(com.google.protobuf.source_context.SourceContext.defaultInstance))) + case 48 => + __syntax = com.google.protobuf.`type`.Syntax.fromValue(_input__.readEnum()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.`type`.Type = { + com.google.protobuf.`type`.Type( + name = __name, + fields = __fields.result(), + oneofs = __oneofs.result(), + options = __options.result(), + sourceContext = __sourceContext, + syntax = __syntax, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.`type`.Type, com.google.protobuf.`type`.Type.Builder] { + def apply(): Builder = new Builder( + __name = "", + __fields = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field], + __oneofs = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto], + __sourceContext = _root_.scala.None, + __syntax = com.google.protobuf.`type`.Syntax.SYNTAX_PROTO2, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.`type`.Type): Builder = new Builder( + __name = _message__.name, + __fields = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.Field] ++= _message__.fields, + __oneofs = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.oneofs, + __options = _root_.scala.collection.immutable.Vector.newBuilder[com.google.protobuf.`type`.OptionProto] ++= _message__.options, + __sourceContext = _message__.sourceContext, + __syntax = _message__.syntax, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.`type`.Type.Builder() + def newBuilder(a: com.google.protobuf.`type`.Type): Builder = com.google.protobuf.`type`.Type.Builder(a) implicit class TypeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.`type`.Type]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.`type`.Type](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def fields: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.`type`.Field]] = field(_.fields)((c_, f_) => c_.copy(fields = f_)) diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala index 6d712701c..769347386 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BoolValue.scala @@ -71,28 +71,7 @@ final case class BoolValue( object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BoolValue] = this - def merge(`_message__`: com.google.protobuf.wrappers.BoolValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readBool() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.BoolValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.BoolValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BoolValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BoolValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object BoolValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.w lazy val defaultInstance = com.google.protobuf.wrappers.BoolValue( value = false ) + final class Builder private ( + private var __value: _root_.scala.Boolean, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.BoolValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readBool() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.BoolValue = { + com.google.protobuf.wrappers.BoolValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.BoolValue, com.google.protobuf.wrappers.BoolValue.Builder] { + def apply(): Builder = new Builder( + __value = false, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.BoolValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.BoolValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.BoolValue): Builder = com.google.protobuf.wrappers.BoolValue.Builder(a) implicit class BoolValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.BoolValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.BoolValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala index 8bb30aa09..161cdf158 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/BytesValue.scala @@ -71,28 +71,7 @@ final case class BytesValue( object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.BytesValue] = this - def merge(`_message__`: com.google.protobuf.wrappers.BytesValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __value = _input__.readBytes() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.BytesValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.BytesValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.BytesValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.BytesValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object BytesValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.BytesValue( value = _root_.com.google.protobuf.ByteString.EMPTY ) + final class Builder private ( + private var __value: _root_.com.google.protobuf.ByteString, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.BytesValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __value = _input__.readBytes() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.BytesValue = { + com.google.protobuf.wrappers.BytesValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.BytesValue, com.google.protobuf.wrappers.BytesValue.Builder] { + def apply(): Builder = new Builder( + __value = _root_.com.google.protobuf.ByteString.EMPTY, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.BytesValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.BytesValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.BytesValue): Builder = com.google.protobuf.wrappers.BytesValue.Builder(a) implicit class BytesValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.BytesValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.BytesValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala index a7043f9f9..498483f8e 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/DoubleValue.scala @@ -71,28 +71,7 @@ final case class DoubleValue( object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.DoubleValue] = this - def merge(`_message__`: com.google.protobuf.wrappers.DoubleValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 9 => - __value = _input__.readDouble() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.DoubleValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.DoubleValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.DoubleValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.DoubleValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object DoubleValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.DoubleValue( value = 0.0 ) + final class Builder private ( + private var __value: _root_.scala.Double, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.DoubleValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 9 => + __value = _input__.readDouble() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.DoubleValue = { + com.google.protobuf.wrappers.DoubleValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.DoubleValue, com.google.protobuf.wrappers.DoubleValue.Builder] { + def apply(): Builder = new Builder( + __value = 0.0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.DoubleValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.DoubleValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.DoubleValue): Builder = com.google.protobuf.wrappers.DoubleValue.Builder(a) implicit class DoubleValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.DoubleValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.DoubleValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Double] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala index 6f39e69ba..f66c181b9 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/FloatValue.scala @@ -71,28 +71,7 @@ final case class FloatValue( object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.FloatValue] = this - def merge(`_message__`: com.google.protobuf.wrappers.FloatValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 13 => - __value = _input__.readFloat() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.FloatValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.FloatValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.FloatValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.FloatValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object FloatValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.FloatValue( value = 0.0f ) + final class Builder private ( + private var __value: _root_.scala.Float, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.FloatValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 13 => + __value = _input__.readFloat() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.FloatValue = { + com.google.protobuf.wrappers.FloatValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.FloatValue, com.google.protobuf.wrappers.FloatValue.Builder] { + def apply(): Builder = new Builder( + __value = 0.0f, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.FloatValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.FloatValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.FloatValue): Builder = com.google.protobuf.wrappers.FloatValue.Builder(a) implicit class FloatValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.FloatValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.FloatValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Float] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala index 30499697a..5c5f76014 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int32Value.scala @@ -71,28 +71,7 @@ final case class Int32Value( object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int32Value] = this - def merge(`_message__`: com.google.protobuf.wrappers.Int32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.Int32Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.Int32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int32Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int32Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object Int32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.Int32Value( value = 0 ) + final class Builder private ( + private var __value: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.Int32Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.Int32Value = { + com.google.protobuf.wrappers.Int32Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.Int32Value, com.google.protobuf.wrappers.Int32Value.Builder] { + def apply(): Builder = new Builder( + __value = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.Int32Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.Int32Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.Int32Value): Builder = com.google.protobuf.wrappers.Int32Value.Builder(a) implicit class Int32ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.Int32Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.Int32Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala index bde5c3ee8..5f50666d0 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/Int64Value.scala @@ -71,28 +71,7 @@ final case class Int64Value( object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.Int64Value] = this - def merge(`_message__`: com.google.protobuf.wrappers.Int64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readInt64() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.Int64Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.Int64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.Int64Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.Int64Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object Int64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf. lazy val defaultInstance = com.google.protobuf.wrappers.Int64Value( value = 0L ) + final class Builder private ( + private var __value: _root_.scala.Long, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.Int64Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readInt64() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.Int64Value = { + com.google.protobuf.wrappers.Int64Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.Int64Value, com.google.protobuf.wrappers.Int64Value.Builder] { + def apply(): Builder = new Builder( + __value = 0L, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.Int64Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.Int64Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.Int64Value): Builder = com.google.protobuf.wrappers.Int64Value.Builder(a) implicit class Int64ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.Int64Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.Int64Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala index 59c85d22d..5d56dc653 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/StringValue.scala @@ -71,28 +71,7 @@ final case class StringValue( object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.StringValue] = this - def merge(`_message__`: com.google.protobuf.wrappers.StringValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __value = _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.StringValue( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.StringValue, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.StringValue = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.StringValue] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object StringValue extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.StringValue( value = "" ) + final class Builder private ( + private var __value: _root_.scala.Predef.String, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.StringValue] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __value = _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.StringValue = { + com.google.protobuf.wrappers.StringValue( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.StringValue, com.google.protobuf.wrappers.StringValue.Builder] { + def apply(): Builder = new Builder( + __value = "", + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.StringValue): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.StringValue.Builder() + def newBuilder(a: com.google.protobuf.wrappers.StringValue): Builder = com.google.protobuf.wrappers.StringValue.Builder(a) implicit class StringValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.StringValue]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.StringValue](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala index fa50f049d..ebf7246dc 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt32Value.scala @@ -71,28 +71,7 @@ final case class UInt32Value( object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt32Value] = this - def merge(`_message__`: com.google.protobuf.wrappers.UInt32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readUInt32() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.UInt32Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.UInt32Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt32Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt32Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object UInt32Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.UInt32Value( value = 0 ) + final class Builder private ( + private var __value: _root_.scala.Int, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.UInt32Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readUInt32() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.UInt32Value = { + com.google.protobuf.wrappers.UInt32Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.UInt32Value, com.google.protobuf.wrappers.UInt32Value.Builder] { + def apply(): Builder = new Builder( + __value = 0, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.UInt32Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.UInt32Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.UInt32Value): Builder = com.google.protobuf.wrappers.UInt32Value.Builder(a) implicit class UInt32ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.UInt32Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.UInt32Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala index e6effbcb4..2bf931018 100644 --- a/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala +++ b/scalapb-runtime/non-jvm/src/main/scala/com/google/protobuf/wrappers/UInt64Value.scala @@ -71,28 +71,7 @@ final case class UInt64Value( object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[com.google.protobuf.wrappers.UInt64Value] = this - def merge(`_message__`: com.google.protobuf.wrappers.UInt64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = { - var __value = `_message__`.value - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 8 => - __value = _input__.readUInt64() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - com.google.protobuf.wrappers.UInt64Value( - value = __value, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: com.google.protobuf.wrappers.UInt64Value, `_input__`: _root_.com.google.protobuf.CodedInputStream): com.google.protobuf.wrappers.UInt64Value = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[com.google.protobuf.wrappers.UInt64Value] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -109,6 +88,46 @@ object UInt64Value extends scalapb.GeneratedMessageCompanion[com.google.protobuf lazy val defaultInstance = com.google.protobuf.wrappers.UInt64Value( value = 0L ) + final class Builder private ( + private var __value: _root_.scala.Long, + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[com.google.protobuf.wrappers.UInt64Value] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 8 => + __value = _input__.readUInt64() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): com.google.protobuf.wrappers.UInt64Value = { + com.google.protobuf.wrappers.UInt64Value( + value = __value, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[com.google.protobuf.wrappers.UInt64Value, com.google.protobuf.wrappers.UInt64Value.Builder] { + def apply(): Builder = new Builder( + __value = 0L, + `_unknownFields__` = null + ) + def apply(`_message__`: com.google.protobuf.wrappers.UInt64Value): Builder = new Builder( + __value = _message__.value, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = com.google.protobuf.wrappers.UInt64Value.Builder() + def newBuilder(a: com.google.protobuf.wrappers.UInt64Value): Builder = com.google.protobuf.wrappers.UInt64Value.Builder(a) implicit class UInt64ValueLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.wrappers.UInt64Value]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.protobuf.wrappers.UInt64Value](_l) { def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.value)((c_, f_) => c_.copy(value = f_)) } diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/GeneratedMessageCompanion.scala b/scalapb-runtime/shared/src/main/scala/scalapb/GeneratedMessageCompanion.scala index de1b85585..189f470da 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/GeneratedMessageCompanion.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/GeneratedMessageCompanion.scala @@ -2,13 +2,13 @@ package scalapb import java.io.{InputStream, OutputStream} -import com.github.ghik.silencer.silent import com.google.protobuf.{ByteString, CodedInputStream, CodedOutputStream} import com.google.protobuf.{Descriptors => JavaDescriptors} import scalapb.lenses.{Lens, Updatable} import _root_.scalapb.descriptors.{PMessage, PValue} import scala.util.Try +import com.github.ghik.silencer.silent trait GeneratedEnum extends Any with Product with Serializable { type EnumType <: GeneratedEnum @@ -153,8 +153,13 @@ trait JavaProtoSupport[ScalaPB, JavaPB] extends Any { @silent("Stream in package scala is deprecated") trait GeneratedMessageCompanion[A <: GeneratedMessage] { type ValueType = A + def merge(a: A, input: CodedInputStream): A + /** Parses a message from a CodedInputStream. */ + // TODO(nadav): The implementation here should not rely on `newBuilder` for binary compatibility: + // Older 0.10.x generated code may not have it defined. In 0.10.x, the generated messages override + // this method. This can be eliminated in ScalaPB 0.11.0. def parseFrom(input: CodedInputStream): A = merge(defaultInstance, input) def parseFrom(input: InputStream): A = parseFrom(CodedInputStream.newInstance(input)) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/LiteParser.scala b/scalapb-runtime/shared/src/main/scala/scalapb/LiteParser.scala index 92b5b732b..b89052211 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/LiteParser.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/LiteParser.scala @@ -16,6 +16,17 @@ object LiteParser { result } + def readMessage[A <: GeneratedMessage](input: CodedInputStream)( + implicit cmp: GeneratedMessageCompanion[A] + ): A = { + val length = input.readRawVarint32() + val oldLimit = input.pushLimit(length) + val result: A = cmp.parseFrom(input) + input.checkLastTagWas(0) + input.popLimit(oldLimit) + result + } + def parseDelimitedFrom[A <: GeneratedMessage]( input: InputStream )(implicit cmp: GeneratedMessageCompanion[A]): Option[A] = { @@ -31,7 +42,7 @@ object LiteParser { input: CodedInputStream )(implicit cmp: GeneratedMessageCompanion[A]): Option[A] = { if (input.isAtEnd) None - else Some(readMessage(input, cmp.defaultInstance)) + else Some(readMessage(input)) } @inline diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/MessageBuilder.scala b/scalapb-runtime/shared/src/main/scala/scalapb/MessageBuilder.scala new file mode 100644 index 000000000..43ead28b9 --- /dev/null +++ b/scalapb-runtime/shared/src/main/scala/scalapb/MessageBuilder.scala @@ -0,0 +1,22 @@ +package scalapb + +import com.google.protobuf.CodedInputStream + +/** Allows building an instance of a message A + * + * The code generator will create a class that extends MessageBuilder for each message. + * It generally contains a `var` for each optional and required field, and a + * [scala.collection.mutable.Builder] for each repeated field. + */ +abstract class MessageBuilder[A] { + def merge(input: CodedInputStream): this.type + + /* Builds an instance of `A`. The message may throw an exception of type + com.google.protobuf.InvalidProtocolBufferException when a required field is missing. + */ + def result(): A +} + +trait MessageBuilderCompanion[A, Builder] { + def apply(a: A): Builder +} diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala index cb7975e1c..8d1845fe9 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumOptions.scala @@ -96,36 +96,7 @@ final case class EnumOptions( object EnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.EnumOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.EnumOptions] = this - def merge(`_message__`: scalapb.options.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumOptions = { - val __extends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.`extends`) - val __companionExtends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.companionExtends) - var __type = `_message__`.`type` - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __extends += _input__.readStringRequireUtf8() - case 18 => - __companionExtends += _input__.readStringRequireUtf8() - case 26 => - __type = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.EnumOptions( - `extends` = __extends.result(), - companionExtends = __companionExtends.result(), - `type` = __type, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.EnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.EnumOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -146,6 +117,58 @@ object EnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.Enu companionExtends = _root_.scala.Seq.empty, `type` = _root_.scala.None ) + final class Builder private ( + private var __extends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __companionExtends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __type: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.EnumOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __extends += _input__.readStringRequireUtf8() + case 18 => + __companionExtends += _input__.readStringRequireUtf8() + case 26 => + __type = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.EnumOptions = { + scalapb.options.EnumOptions( + `extends` = __extends.result(), + companionExtends = __companionExtends.result(), + `type` = __type, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.EnumOptions, scalapb.options.EnumOptions.Builder] { + def apply(): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __companionExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __type = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.EnumOptions): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.`extends`, + __companionExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.companionExtends, + __type = _message__.`type`, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.EnumOptions.Builder() + def newBuilder(a: scalapb.options.EnumOptions): Builder = scalapb.options.EnumOptions.Builder(a) implicit class EnumOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.EnumOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.EnumOptions](_l) { def `extends`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.`extends`)((c_, f_) => c_.copy(`extends` = f_)) def companionExtends: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.companionExtends)((c_, f_) => c_.copy(companionExtends = f_)) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala index 3e7955e40..3b0726bfe 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/EnumValueOptions.scala @@ -78,32 +78,7 @@ final case class EnumValueOptions( object EnumValueOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.EnumValueOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.EnumValueOptions] = this - def merge(`_message__`: scalapb.options.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumValueOptions = { - val __extends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.`extends`) - var __scalaName = `_message__`.scalaName - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __extends += _input__.readStringRequireUtf8() - case 18 => - __scalaName = Option(_input__.readStringRequireUtf8()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.EnumValueOptions( - `extends` = __extends.result(), - scalaName = __scalaName, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.EnumValueOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.EnumValueOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.EnumValueOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -122,6 +97,52 @@ object EnumValueOptions extends scalapb.GeneratedMessageCompanion[scalapb.option `extends` = _root_.scala.Seq.empty, scalaName = _root_.scala.None ) + final class Builder private ( + private var __extends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __scalaName: _root_.scala.Option[_root_.scala.Predef.String], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.EnumValueOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __extends += _input__.readStringRequireUtf8() + case 18 => + __scalaName = Option(_input__.readStringRequireUtf8()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.EnumValueOptions = { + scalapb.options.EnumValueOptions( + `extends` = __extends.result(), + scalaName = __scalaName, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.EnumValueOptions, scalapb.options.EnumValueOptions.Builder] { + def apply(): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __scalaName = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.EnumValueOptions): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.`extends`, + __scalaName = _message__.scalaName, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.EnumValueOptions.Builder() + def newBuilder(a: scalapb.options.EnumValueOptions): Builder = scalapb.options.EnumValueOptions.Builder(a) implicit class EnumValueOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.EnumValueOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.EnumValueOptions](_l) { def `extends`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.`extends`)((c_, f_) => c_.copy(`extends` = f_)) def scalaName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getScalaName)((c_, f_) => c_.copy(scalaName = Option(f_))) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala index 53a567095..901233ab9 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/FieldOptions.scala @@ -173,56 +173,7 @@ final case class FieldOptions( object FieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.FieldOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.FieldOptions] = this - def merge(`_message__`: scalapb.options.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.FieldOptions = { - var __type = `_message__`.`type` - var __scalaName = `_message__`.scalaName - var __collectionType = `_message__`.collectionType - var __keyType = `_message__`.keyType - var __valueType = `_message__`.valueType - val __annotations = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.annotations) - var __mapType = `_message__`.mapType - var __noBox = `_message__`.noBox - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __type = Option(_input__.readStringRequireUtf8()) - case 18 => - __scalaName = Option(_input__.readStringRequireUtf8()) - case 26 => - __collectionType = Option(_input__.readStringRequireUtf8()) - case 34 => - __keyType = Option(_input__.readStringRequireUtf8()) - case 42 => - __valueType = Option(_input__.readStringRequireUtf8()) - case 50 => - __annotations += _input__.readStringRequireUtf8() - case 58 => - __mapType = Option(_input__.readStringRequireUtf8()) - case 240 => - __noBox = Option(_input__.readBool()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.FieldOptions( - `type` = __type, - scalaName = __scalaName, - collectionType = __collectionType, - keyType = __keyType, - valueType = __valueType, - annotations = __annotations.result(), - mapType = __mapType, - noBox = __noBox, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.FieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.FieldOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.FieldOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -253,6 +204,88 @@ object FieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.Fi mapType = _root_.scala.None, noBox = _root_.scala.None ) + final class Builder private ( + private var __type: _root_.scala.Option[_root_.scala.Predef.String], + private var __scalaName: _root_.scala.Option[_root_.scala.Predef.String], + private var __collectionType: _root_.scala.Option[_root_.scala.Predef.String], + private var __keyType: _root_.scala.Option[_root_.scala.Predef.String], + private var __valueType: _root_.scala.Option[_root_.scala.Predef.String], + private var __annotations: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __mapType: _root_.scala.Option[_root_.scala.Predef.String], + private var __noBox: _root_.scala.Option[_root_.scala.Boolean], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.FieldOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __type = Option(_input__.readStringRequireUtf8()) + case 18 => + __scalaName = Option(_input__.readStringRequireUtf8()) + case 26 => + __collectionType = Option(_input__.readStringRequireUtf8()) + case 34 => + __keyType = Option(_input__.readStringRequireUtf8()) + case 42 => + __valueType = Option(_input__.readStringRequireUtf8()) + case 50 => + __annotations += _input__.readStringRequireUtf8() + case 58 => + __mapType = Option(_input__.readStringRequireUtf8()) + case 240 => + __noBox = Option(_input__.readBool()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.FieldOptions = { + scalapb.options.FieldOptions( + `type` = __type, + scalaName = __scalaName, + collectionType = __collectionType, + keyType = __keyType, + valueType = __valueType, + annotations = __annotations.result(), + mapType = __mapType, + noBox = __noBox, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.FieldOptions, scalapb.options.FieldOptions.Builder] { + def apply(): Builder = new Builder( + __type = _root_.scala.None, + __scalaName = _root_.scala.None, + __collectionType = _root_.scala.None, + __keyType = _root_.scala.None, + __valueType = _root_.scala.None, + __annotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __mapType = _root_.scala.None, + __noBox = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.FieldOptions): Builder = new Builder( + __type = _message__.`type`, + __scalaName = _message__.scalaName, + __collectionType = _message__.collectionType, + __keyType = _message__.keyType, + __valueType = _message__.valueType, + __annotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.annotations, + __mapType = _message__.mapType, + __noBox = _message__.noBox, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.FieldOptions.Builder() + def newBuilder(a: scalapb.options.FieldOptions): Builder = scalapb.options.FieldOptions.Builder(a) implicit class FieldOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.FieldOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.FieldOptions](_l) { def `type`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getType)((c_, f_) => c_.copy(`type` = Option(f_))) def optionalType: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala index 36f51c2f9..48d224e47 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/MessageOptions.scala @@ -181,56 +181,7 @@ final case class MessageOptions( object MessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.MessageOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.MessageOptions] = this - def merge(`_message__`: scalapb.options.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.MessageOptions = { - val __extends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.`extends`) - val __companionExtends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.companionExtends) - val __annotations = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.annotations) - var __type = `_message__`.`type` - val __companionAnnotations = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.companionAnnotations) - val __sealedOneofExtends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.sealedOneofExtends) - var __noBox = `_message__`.noBox - val __unknownFieldsAnnotations = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.unknownFieldsAnnotations) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __extends += _input__.readStringRequireUtf8() - case 18 => - __companionExtends += _input__.readStringRequireUtf8() - case 26 => - __annotations += _input__.readStringRequireUtf8() - case 34 => - __type = Option(_input__.readStringRequireUtf8()) - case 42 => - __companionAnnotations += _input__.readStringRequireUtf8() - case 50 => - __sealedOneofExtends += _input__.readStringRequireUtf8() - case 56 => - __noBox = Option(_input__.readBool()) - case 66 => - __unknownFieldsAnnotations += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.MessageOptions( - `extends` = __extends.result(), - companionExtends = __companionExtends.result(), - annotations = __annotations.result(), - `type` = __type, - companionAnnotations = __companionAnnotations.result(), - sealedOneofExtends = __sealedOneofExtends.result(), - noBox = __noBox, - unknownFieldsAnnotations = __unknownFieldsAnnotations.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.MessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.MessageOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.MessageOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -261,6 +212,88 @@ object MessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. noBox = _root_.scala.None, unknownFieldsAnnotations = _root_.scala.Seq.empty ) + final class Builder private ( + private var __extends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __companionExtends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __annotations: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __type: _root_.scala.Option[_root_.scala.Predef.String], + private var __companionAnnotations: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __sealedOneofExtends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __noBox: _root_.scala.Option[_root_.scala.Boolean], + private var __unknownFieldsAnnotations: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.MessageOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __extends += _input__.readStringRequireUtf8() + case 18 => + __companionExtends += _input__.readStringRequireUtf8() + case 26 => + __annotations += _input__.readStringRequireUtf8() + case 34 => + __type = Option(_input__.readStringRequireUtf8()) + case 42 => + __companionAnnotations += _input__.readStringRequireUtf8() + case 50 => + __sealedOneofExtends += _input__.readStringRequireUtf8() + case 56 => + __noBox = Option(_input__.readBool()) + case 66 => + __unknownFieldsAnnotations += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.MessageOptions = { + scalapb.options.MessageOptions( + `extends` = __extends.result(), + companionExtends = __companionExtends.result(), + annotations = __annotations.result(), + `type` = __type, + companionAnnotations = __companionAnnotations.result(), + sealedOneofExtends = __sealedOneofExtends.result(), + noBox = __noBox, + unknownFieldsAnnotations = __unknownFieldsAnnotations.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.MessageOptions, scalapb.options.MessageOptions.Builder] { + def apply(): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __companionExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __annotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __type = _root_.scala.None, + __companionAnnotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __sealedOneofExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __noBox = _root_.scala.None, + __unknownFieldsAnnotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.MessageOptions): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.`extends`, + __companionExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.companionExtends, + __annotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.annotations, + __type = _message__.`type`, + __companionAnnotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.companionAnnotations, + __sealedOneofExtends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.sealedOneofExtends, + __noBox = _message__.noBox, + __unknownFieldsAnnotations = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.unknownFieldsAnnotations, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.MessageOptions.Builder() + def newBuilder(a: scalapb.options.MessageOptions): Builder = scalapb.options.MessageOptions.Builder(a) implicit class MessageOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.MessageOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.MessageOptions](_l) { def `extends`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.`extends`)((c_, f_) => c_.copy(`extends` = f_)) def companionExtends: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.companionExtends)((c_, f_) => c_.copy(companionExtends = f_)) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala index 831184a81..49fbb1b75 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/OneofOptions.scala @@ -62,28 +62,7 @@ final case class OneofOptions( object OneofOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.OneofOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.OneofOptions] = this - def merge(`_message__`: scalapb.options.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.OneofOptions = { - val __extends = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.`extends`) - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __extends += _input__.readStringRequireUtf8() - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.OneofOptions( - `extends` = __extends.result(), - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.OneofOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.OneofOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.OneofOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -100,6 +79,46 @@ object OneofOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.On lazy val defaultInstance = scalapb.options.OneofOptions( `extends` = _root_.scala.Seq.empty ) + final class Builder private ( + private var __extends: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.OneofOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __extends += _input__.readStringRequireUtf8() + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.OneofOptions = { + scalapb.options.OneofOptions( + `extends` = __extends.result(), + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.OneofOptions, scalapb.options.OneofOptions.Builder] { + def apply(): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.OneofOptions): Builder = new Builder( + __extends = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.`extends`, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.OneofOptions.Builder() + def newBuilder(a: scalapb.options.OneofOptions): Builder = scalapb.options.OneofOptions.Builder(a) implicit class OneofOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.OneofOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.OneofOptions](_l) { def `extends`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.`extends`)((c_, f_) => c_.copy(`extends` = f_)) } diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala index 968328b4f..e291fae1a 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala @@ -428,112 +428,7 @@ final case class ScalaPbOptions( object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions] = this - def merge(`_message__`: scalapb.options.ScalaPbOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions = { - var __packageName = `_message__`.packageName - var __flatPackage = `_message__`.flatPackage - val __import = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.`import`) - val __preamble = (_root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= `_message__`.preamble) - var __singleFile = `_message__`.singleFile - var __noPrimitiveWrappers = `_message__`.noPrimitiveWrappers - var __primitiveWrappers = `_message__`.primitiveWrappers - var __collectionType = `_message__`.collectionType - var __preserveUnknownFields = `_message__`.preserveUnknownFields - var __objectName = `_message__`.objectName - var __scope = `_message__`.scope - var __lenses = `_message__`.lenses - var __retainSourceCodeInfo = `_message__`.retainSourceCodeInfo - var __mapType = `_message__`.mapType - var __noDefaultValuesInConstructor = `_message__`.noDefaultValuesInConstructor - var __enumValueNaming = `_message__`.enumValueNaming - var __enumStripPrefix = `_message__`.enumStripPrefix - val __auxMessageOptions = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxMessageOptions] ++= `_message__`.auxMessageOptions) - val __auxFieldOptions = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxFieldOptions] ++= `_message__`.auxFieldOptions) - val __auxEnumOptions = (_root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxEnumOptions] ++= `_message__`.auxEnumOptions) - var __bytesType = `_message__`.bytesType - var __testOnlyNoJavaConversions = `_message__`.testOnlyNoJavaConversions - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __packageName = Option(_input__.readStringRequireUtf8()) - case 16 => - __flatPackage = Option(_input__.readBool()) - case 26 => - __import += _input__.readStringRequireUtf8() - case 34 => - __preamble += _input__.readStringRequireUtf8() - case 40 => - __singleFile = Option(_input__.readBool()) - case 56 => - __noPrimitiveWrappers = Option(_input__.readBool()) - case 48 => - __primitiveWrappers = Option(_input__.readBool()) - case 66 => - __collectionType = Option(_input__.readStringRequireUtf8()) - case 72 => - __preserveUnknownFields = Option(_input__.readBool()) - case 82 => - __objectName = Option(_input__.readStringRequireUtf8()) - case 88 => - __scope = Option(scalapb.options.ScalaPbOptions.OptionsScope.fromValue(_input__.readEnum())) - case 96 => - __lenses = Option(_input__.readBool()) - case 104 => - __retainSourceCodeInfo = Option(_input__.readBool()) - case 114 => - __mapType = Option(_input__.readStringRequireUtf8()) - case 120 => - __noDefaultValuesInConstructor = Option(_input__.readBool()) - case 128 => - __enumValueNaming = Option(scalapb.options.ScalaPbOptions.EnumValueNaming.fromValue(_input__.readEnum())) - case 136 => - __enumStripPrefix = Option(_input__.readBool()) - case 146 => - __auxMessageOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxMessageOptions.defaultInstance) - case 154 => - __auxFieldOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxFieldOptions.defaultInstance) - case 162 => - __auxEnumOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxEnumOptions.defaultInstance) - case 170 => - __bytesType = Option(_input__.readStringRequireUtf8()) - case 8008 => - __testOnlyNoJavaConversions = Option(_input__.readBool()) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.ScalaPbOptions( - packageName = __packageName, - flatPackage = __flatPackage, - `import` = __import.result(), - preamble = __preamble.result(), - singleFile = __singleFile, - noPrimitiveWrappers = __noPrimitiveWrappers, - primitiveWrappers = __primitiveWrappers, - collectionType = __collectionType, - preserveUnknownFields = __preserveUnknownFields, - objectName = __objectName, - scope = __scope, - lenses = __lenses, - retainSourceCodeInfo = __retainSourceCodeInfo, - mapType = __mapType, - noDefaultValuesInConstructor = __noDefaultValuesInConstructor, - enumValueNaming = __enumValueNaming, - enumStripPrefix = __enumStripPrefix, - auxMessageOptions = __auxMessageOptions.result(), - auxFieldOptions = __auxFieldOptions.result(), - auxEnumOptions = __auxEnumOptions.result(), - bytesType = __bytesType, - testOnlyNoJavaConversions = __testOnlyNoJavaConversions, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.ScalaPbOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -610,6 +505,172 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType = _root_.scala.None, testOnlyNoJavaConversions = _root_.scala.None ) + final class Builder private ( + private var __packageName: _root_.scala.Option[_root_.scala.Predef.String], + private var __flatPackage: _root_.scala.Option[_root_.scala.Boolean], + private var __import: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __preamble: collection.mutable.Builder[_root_.scala.Predef.String, _root_.scala.Seq[_root_.scala.Predef.String]], + private var __singleFile: _root_.scala.Option[_root_.scala.Boolean], + private var __noPrimitiveWrappers: _root_.scala.Option[_root_.scala.Boolean], + private var __primitiveWrappers: _root_.scala.Option[_root_.scala.Boolean], + private var __collectionType: _root_.scala.Option[_root_.scala.Predef.String], + private var __preserveUnknownFields: _root_.scala.Option[_root_.scala.Boolean], + private var __objectName: _root_.scala.Option[_root_.scala.Predef.String], + private var __scope: _root_.scala.Option[scalapb.options.ScalaPbOptions.OptionsScope], + private var __lenses: _root_.scala.Option[_root_.scala.Boolean], + private var __retainSourceCodeInfo: _root_.scala.Option[_root_.scala.Boolean], + private var __mapType: _root_.scala.Option[_root_.scala.Predef.String], + private var __noDefaultValuesInConstructor: _root_.scala.Option[_root_.scala.Boolean], + private var __enumValueNaming: _root_.scala.Option[scalapb.options.ScalaPbOptions.EnumValueNaming], + private var __enumStripPrefix: _root_.scala.Option[_root_.scala.Boolean], + private var __auxMessageOptions: collection.mutable.Builder[scalapb.options.ScalaPbOptions.AuxMessageOptions, _root_.scala.Seq[scalapb.options.ScalaPbOptions.AuxMessageOptions]], + private var __auxFieldOptions: collection.mutable.Builder[scalapb.options.ScalaPbOptions.AuxFieldOptions, _root_.scala.Seq[scalapb.options.ScalaPbOptions.AuxFieldOptions]], + private var __auxEnumOptions: collection.mutable.Builder[scalapb.options.ScalaPbOptions.AuxEnumOptions, _root_.scala.Seq[scalapb.options.ScalaPbOptions.AuxEnumOptions]], + private var __bytesType: _root_.scala.Option[_root_.scala.Predef.String], + private var __testOnlyNoJavaConversions: _root_.scala.Option[_root_.scala.Boolean], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.ScalaPbOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __packageName = Option(_input__.readStringRequireUtf8()) + case 16 => + __flatPackage = Option(_input__.readBool()) + case 26 => + __import += _input__.readStringRequireUtf8() + case 34 => + __preamble += _input__.readStringRequireUtf8() + case 40 => + __singleFile = Option(_input__.readBool()) + case 56 => + __noPrimitiveWrappers = Option(_input__.readBool()) + case 48 => + __primitiveWrappers = Option(_input__.readBool()) + case 66 => + __collectionType = Option(_input__.readStringRequireUtf8()) + case 72 => + __preserveUnknownFields = Option(_input__.readBool()) + case 82 => + __objectName = Option(_input__.readStringRequireUtf8()) + case 88 => + __scope = Option(scalapb.options.ScalaPbOptions.OptionsScope.fromValue(_input__.readEnum())) + case 96 => + __lenses = Option(_input__.readBool()) + case 104 => + __retainSourceCodeInfo = Option(_input__.readBool()) + case 114 => + __mapType = Option(_input__.readStringRequireUtf8()) + case 120 => + __noDefaultValuesInConstructor = Option(_input__.readBool()) + case 128 => + __enumValueNaming = Option(scalapb.options.ScalaPbOptions.EnumValueNaming.fromValue(_input__.readEnum())) + case 136 => + __enumStripPrefix = Option(_input__.readBool()) + case 146 => + __auxMessageOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxMessageOptions.defaultInstance) + case 154 => + __auxFieldOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxFieldOptions.defaultInstance) + case 162 => + __auxEnumOptions += _root_.scalapb.LiteParser.readMessage(_input__, scalapb.options.ScalaPbOptions.AuxEnumOptions.defaultInstance) + case 170 => + __bytesType = Option(_input__.readStringRequireUtf8()) + case 8008 => + __testOnlyNoJavaConversions = Option(_input__.readBool()) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.ScalaPbOptions = { + scalapb.options.ScalaPbOptions( + packageName = __packageName, + flatPackage = __flatPackage, + `import` = __import.result(), + preamble = __preamble.result(), + singleFile = __singleFile, + noPrimitiveWrappers = __noPrimitiveWrappers, + primitiveWrappers = __primitiveWrappers, + collectionType = __collectionType, + preserveUnknownFields = __preserveUnknownFields, + objectName = __objectName, + scope = __scope, + lenses = __lenses, + retainSourceCodeInfo = __retainSourceCodeInfo, + mapType = __mapType, + noDefaultValuesInConstructor = __noDefaultValuesInConstructor, + enumValueNaming = __enumValueNaming, + enumStripPrefix = __enumStripPrefix, + auxMessageOptions = __auxMessageOptions.result(), + auxFieldOptions = __auxFieldOptions.result(), + auxEnumOptions = __auxEnumOptions.result(), + bytesType = __bytesType, + testOnlyNoJavaConversions = __testOnlyNoJavaConversions, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.ScalaPbOptions, scalapb.options.ScalaPbOptions.Builder] { + def apply(): Builder = new Builder( + __packageName = _root_.scala.None, + __flatPackage = _root_.scala.None, + __import = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __preamble = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String], + __singleFile = _root_.scala.None, + __noPrimitiveWrappers = _root_.scala.None, + __primitiveWrappers = _root_.scala.None, + __collectionType = _root_.scala.None, + __preserveUnknownFields = _root_.scala.None, + __objectName = _root_.scala.None, + __scope = _root_.scala.None, + __lenses = _root_.scala.None, + __retainSourceCodeInfo = _root_.scala.None, + __mapType = _root_.scala.None, + __noDefaultValuesInConstructor = _root_.scala.None, + __enumValueNaming = _root_.scala.None, + __enumStripPrefix = _root_.scala.None, + __auxMessageOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxMessageOptions], + __auxFieldOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxFieldOptions], + __auxEnumOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxEnumOptions], + __bytesType = _root_.scala.None, + __testOnlyNoJavaConversions = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.ScalaPbOptions): Builder = new Builder( + __packageName = _message__.packageName, + __flatPackage = _message__.flatPackage, + __import = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.`import`, + __preamble = _root_.scala.collection.immutable.Vector.newBuilder[_root_.scala.Predef.String] ++= _message__.preamble, + __singleFile = _message__.singleFile, + __noPrimitiveWrappers = _message__.noPrimitiveWrappers, + __primitiveWrappers = _message__.primitiveWrappers, + __collectionType = _message__.collectionType, + __preserveUnknownFields = _message__.preserveUnknownFields, + __objectName = _message__.objectName, + __scope = _message__.scope, + __lenses = _message__.lenses, + __retainSourceCodeInfo = _message__.retainSourceCodeInfo, + __mapType = _message__.mapType, + __noDefaultValuesInConstructor = _message__.noDefaultValuesInConstructor, + __enumValueNaming = _message__.enumValueNaming, + __enumStripPrefix = _message__.enumStripPrefix, + __auxMessageOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxMessageOptions] ++= _message__.auxMessageOptions, + __auxFieldOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxFieldOptions] ++= _message__.auxFieldOptions, + __auxEnumOptions = _root_.scala.collection.immutable.Vector.newBuilder[scalapb.options.ScalaPbOptions.AuxEnumOptions] ++= _message__.auxEnumOptions, + __bytesType = _message__.bytesType, + __testOnlyNoJavaConversions = _message__.testOnlyNoJavaConversions, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.ScalaPbOptions.Builder() + def newBuilder(a: scalapb.options.ScalaPbOptions): Builder = scalapb.options.ScalaPbOptions.Builder(a) /** Whether to apply the options only to this file, or for the entire package (and its subpackages) */ sealed abstract class OptionsScope(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { @@ -775,32 +836,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. object AuxMessageOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxMessageOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxMessageOptions] = this - def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxMessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxMessageOptions = { - var __target = `_message__`.target - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __target = Option(_input__.readStringRequireUtf8()) - case 18 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.MessageOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.ScalaPbOptions.AuxMessageOptions( - target = __target, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxMessageOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxMessageOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxMessageOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -825,6 +861,52 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. target = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __target: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[scalapb.options.MessageOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.ScalaPbOptions.AuxMessageOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __target = Option(_input__.readStringRequireUtf8()) + case 18 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.MessageOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.ScalaPbOptions.AuxMessageOptions = { + scalapb.options.ScalaPbOptions.AuxMessageOptions( + target = __target, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.ScalaPbOptions.AuxMessageOptions, scalapb.options.ScalaPbOptions.AuxMessageOptions.Builder] { + def apply(): Builder = new Builder( + __target = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.ScalaPbOptions.AuxMessageOptions): Builder = new Builder( + __target = _message__.target, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.ScalaPbOptions.AuxMessageOptions.Builder() + def newBuilder(a: scalapb.options.ScalaPbOptions.AuxMessageOptions): Builder = scalapb.options.ScalaPbOptions.AuxMessageOptions.Builder(a) implicit class AuxMessageOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.ScalaPbOptions.AuxMessageOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.ScalaPbOptions.AuxMessageOptions](_l) { def target: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getTarget)((c_, f_) => c_.copy(target = Option(f_))) def optionalTarget: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.target)((c_, f_) => c_.copy(target = f_)) @@ -922,32 +1004,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. object AuxFieldOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxFieldOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxFieldOptions] = this - def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxFieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxFieldOptions = { - var __target = `_message__`.target - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __target = Option(_input__.readStringRequireUtf8()) - case 18 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.FieldOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.ScalaPbOptions.AuxFieldOptions( - target = __target, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxFieldOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxFieldOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxFieldOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -972,6 +1029,52 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. target = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __target: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[scalapb.options.FieldOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.ScalaPbOptions.AuxFieldOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __target = Option(_input__.readStringRequireUtf8()) + case 18 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.FieldOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.ScalaPbOptions.AuxFieldOptions = { + scalapb.options.ScalaPbOptions.AuxFieldOptions( + target = __target, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.ScalaPbOptions.AuxFieldOptions, scalapb.options.ScalaPbOptions.AuxFieldOptions.Builder] { + def apply(): Builder = new Builder( + __target = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.ScalaPbOptions.AuxFieldOptions): Builder = new Builder( + __target = _message__.target, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.ScalaPbOptions.AuxFieldOptions.Builder() + def newBuilder(a: scalapb.options.ScalaPbOptions.AuxFieldOptions): Builder = scalapb.options.ScalaPbOptions.AuxFieldOptions.Builder(a) implicit class AuxFieldOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.ScalaPbOptions.AuxFieldOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.ScalaPbOptions.AuxFieldOptions](_l) { def target: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getTarget)((c_, f_) => c_.copy(target = Option(f_))) def optionalTarget: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.target)((c_, f_) => c_.copy(target = f_)) @@ -1069,32 +1172,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. object AuxEnumOptions extends scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxEnumOptions] { implicit def messageCompanion: scalapb.GeneratedMessageCompanion[scalapb.options.ScalaPbOptions.AuxEnumOptions] = this - def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxEnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxEnumOptions = { - var __target = `_message__`.target - var __options = `_message__`.options - var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder = null - var _done__ = false - while (!_done__) { - val _tag__ = _input__.readTag() - _tag__ match { - case 0 => _done__ = true - case 10 => - __target = Option(_input__.readStringRequireUtf8()) - case 18 => - __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.EnumOptions.defaultInstance))) - case tag => - if (_unknownFields__ == null) { - _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) - } - _unknownFields__.parseField(tag, _input__) - } - } - scalapb.options.ScalaPbOptions.AuxEnumOptions( - target = __target, - options = __options, - unknownFields = if (_unknownFields__ == null) _message__.unknownFields else _unknownFields__.result() - ) - } + def merge(`_message__`: scalapb.options.ScalaPbOptions.AuxEnumOptions, `_input__`: _root_.com.google.protobuf.CodedInputStream): scalapb.options.ScalaPbOptions.AuxEnumOptions = newBuilder(_message__).merge(_input__).result() implicit def messageReads: _root_.scalapb.descriptors.Reads[scalapb.options.ScalaPbOptions.AuxEnumOptions] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage == scalaDescriptor), "FieldDescriptor does not match message type.") @@ -1119,6 +1197,52 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. target = _root_.scala.None, options = _root_.scala.None ) + final class Builder private ( + private var __target: _root_.scala.Option[_root_.scala.Predef.String], + private var __options: _root_.scala.Option[scalapb.options.EnumOptions], + private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder + ) extends _root_.scalapb.MessageBuilder[scalapb.options.ScalaPbOptions.AuxEnumOptions] { + def merge(`_input__`: _root_.com.google.protobuf.CodedInputStream): this.type = { + var _done__ = false + while (!_done__) { + val _tag__ = _input__.readTag() + _tag__ match { + case 0 => _done__ = true + case 10 => + __target = Option(_input__.readStringRequireUtf8()) + case 18 => + __options = Option(_root_.scalapb.LiteParser.readMessage(_input__, __options.getOrElse(scalapb.options.EnumOptions.defaultInstance))) + case tag => + if (_unknownFields__ == null) { + _unknownFields__ = new _root_.scalapb.UnknownFieldSet.Builder() + } + _unknownFields__.parseField(tag, _input__) + } + } + this + } + def result(): scalapb.options.ScalaPbOptions.AuxEnumOptions = { + scalapb.options.ScalaPbOptions.AuxEnumOptions( + target = __target, + options = __options, + unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() + ) + } + } + object Builder extends _root_.scalapb.MessageBuilderCompanion[scalapb.options.ScalaPbOptions.AuxEnumOptions, scalapb.options.ScalaPbOptions.AuxEnumOptions.Builder] { + def apply(): Builder = new Builder( + __target = _root_.scala.None, + __options = _root_.scala.None, + `_unknownFields__` = null + ) + def apply(`_message__`: scalapb.options.ScalaPbOptions.AuxEnumOptions): Builder = new Builder( + __target = _message__.target, + __options = _message__.options, + `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) + ) + } + def newBuilder: Builder = scalapb.options.ScalaPbOptions.AuxEnumOptions.Builder() + def newBuilder(a: scalapb.options.ScalaPbOptions.AuxEnumOptions): Builder = scalapb.options.ScalaPbOptions.AuxEnumOptions.Builder(a) implicit class AuxEnumOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, scalapb.options.ScalaPbOptions.AuxEnumOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, scalapb.options.ScalaPbOptions.AuxEnumOptions](_l) { def target: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getTarget)((c_, f_) => c_.copy(target = Option(f_))) def optionalTarget: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.target)((c_, f_) => c_.copy(target = f_))