diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/FileOptionsCache.scala b/compiler-plugin/src/main/scala/scalapb/compiler/FileOptionsCache.scala index d07a4a2ac..31f41c71d 100644 --- a/compiler-plugin/src/main/scala/scalapb/compiler/FileOptionsCache.scala +++ b/compiler-plugin/src/main/scala/scalapb/compiler/FileOptionsCache.scala @@ -172,7 +172,7 @@ object FileOptionsCache { fileOptions.map { case (f, opts) => f -> - (if (opts.getIgnoreFieldTransformations) opts + (if (opts.getIgnoreAllTransformations) opts else opts.toBuilder .addAllAuxFieldOptions( diff --git a/compiler-plugin/src/test/scala/scalapb/compiler/FieldTransformationsSpec.scala b/compiler-plugin/src/test/scala/scalapb/compiler/FieldTransformationsSpec.scala index 36fbc33d8..3e3da6215 100644 --- a/compiler-plugin/src/test/scala/scalapb/compiler/FieldTransformationsSpec.scala +++ b/compiler-plugin/src/test/scala/scalapb/compiler/FieldTransformationsSpec.scala @@ -99,7 +99,7 @@ class FieldTransformationsSpec extends AnyFlatSpec with Matchers with ProtocInvo |import "myvalidate.proto"; |import "scalapb/scalapb.proto"; |option (scalapb.options) = { - | ignore_field_transformations: true + | ignore_all_transformations: true |}; |message I { | int32 x = 1 [(opts.rules).int32 = {gt: 12}]; diff --git a/protobuf/scalapb/scalapb.proto b/protobuf/scalapb/scalapb.proto index 298fed959..9f8138d24 100644 --- a/protobuf/scalapb/scalapb.proto +++ b/protobuf/scalapb/scalapb.proto @@ -151,9 +151,9 @@ message ScalaPbOptions { repeated FieldTransformation field_transformations = 25; - // Ignores field transformations for this file. This is meant to allow specific files to - // opt out from field transformations inherited through package-scoped options. - optional bool ignore_field_transformations = 26; + // Ignores all transformations for this file. This is meant to allow specific files to + // opt out from transformations inherited through package-scoped options. + optional bool ignore_all_transformations = 26; // For use in tests only. Inhibit Java conversions even when when generator parameters // request for it. 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 ba36702a0..f3c84f534 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalaPbOptions.scala @@ -66,9 +66,9 @@ package scalapb.options * List of message options to apply to some enums. * @param bytesType * Scala type to use for bytes fields. - * @param ignoreFieldTransformations - * Ignores field transformations for this file. This is meant to allow specific files to - * opt out from field transformations inherited through package-scoped options. + * @param ignoreAllTransformations + * Ignores all transformations for this file. This is meant to allow specific files to + * opt out from transformations inherited through package-scoped options. * @param testOnlyNoJavaConversions * For use in tests only. Inhibit Java conversions even when when generator parameters * request for it. @@ -98,7 +98,7 @@ final case class ScalaPbOptions( bytesType: _root_.scala.Option[_root_.scala.Predef.String] = _root_.scala.None, preprocessors: _root_.scala.Seq[_root_.scala.Predef.String] = _root_.scala.Seq.empty, fieldTransformations: _root_.scala.Seq[scalapb.options.FieldTransformation] = _root_.scala.Seq.empty, - ignoreFieldTransformations: _root_.scala.Option[_root_.scala.Boolean] = _root_.scala.None, + ignoreAllTransformations: _root_.scala.Option[_root_.scala.Boolean] = _root_.scala.None, testOnlyNoJavaConversions: _root_.scala.Option[_root_.scala.Boolean] = _root_.scala.None, unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ScalaPbOptions] with _root_.scalapb.ExtendableMessage[ScalaPbOptions] { @@ -198,8 +198,8 @@ final case class ScalaPbOptions( val __value = __item __size += 2 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } - if (ignoreFieldTransformations.isDefined) { - val __value = ignoreFieldTransformations.get + if (ignoreAllTransformations.isDefined) { + val __value = ignoreAllTransformations.get __size += _root_.com.google.protobuf.CodedOutputStream.computeBoolSize(26, __value) }; if (testOnlyNoJavaConversions.isDefined) { @@ -318,7 +318,7 @@ final case class ScalaPbOptions( _output__.writeUInt32NoTag(__m.serializedSize) __m.writeTo(_output__) }; - ignoreFieldTransformations.foreach { __v => + ignoreAllTransformations.foreach { __v => val __m = __v _output__.writeBool(26, __m) }; @@ -404,9 +404,9 @@ final case class ScalaPbOptions( def addFieldTransformations(__vs: scalapb.options.FieldTransformation*): ScalaPbOptions = addAllFieldTransformations(__vs) def addAllFieldTransformations(__vs: Iterable[scalapb.options.FieldTransformation]): ScalaPbOptions = copy(fieldTransformations = fieldTransformations ++ __vs) def withFieldTransformations(__v: _root_.scala.Seq[scalapb.options.FieldTransformation]): ScalaPbOptions = copy(fieldTransformations = __v) - def getIgnoreFieldTransformations: _root_.scala.Boolean = ignoreFieldTransformations.getOrElse(false) - def clearIgnoreFieldTransformations: ScalaPbOptions = copy(ignoreFieldTransformations = _root_.scala.None) - def withIgnoreFieldTransformations(__v: _root_.scala.Boolean): ScalaPbOptions = copy(ignoreFieldTransformations = Option(__v)) + def getIgnoreAllTransformations: _root_.scala.Boolean = ignoreAllTransformations.getOrElse(false) + def clearIgnoreAllTransformations: ScalaPbOptions = copy(ignoreAllTransformations = _root_.scala.None) + def withIgnoreAllTransformations(__v: _root_.scala.Boolean): ScalaPbOptions = copy(ignoreAllTransformations = Option(__v)) def getTestOnlyNoJavaConversions: _root_.scala.Boolean = testOnlyNoJavaConversions.getOrElse(false) def clearTestOnlyNoJavaConversions: ScalaPbOptions = copy(testOnlyNoJavaConversions = _root_.scala.None) def withTestOnlyNoJavaConversions(__v: _root_.scala.Boolean): ScalaPbOptions = copy(testOnlyNoJavaConversions = Option(__v)) @@ -437,7 +437,7 @@ final case class ScalaPbOptions( case 21 => bytesType.orNull case 24 => preprocessors case 25 => fieldTransformations - case 26 => ignoreFieldTransformations.orNull + case 26 => ignoreAllTransformations.orNull case 999 => testOnlyNoJavaConversions.orNull } } @@ -467,7 +467,7 @@ final case class ScalaPbOptions( case 21 => bytesType.map(_root_.scalapb.descriptors.PString(_)).getOrElse(_root_.scalapb.descriptors.PEmpty) case 24 => _root_.scalapb.descriptors.PRepeated(preprocessors.iterator.map(_root_.scalapb.descriptors.PString(_)).toVector) case 25 => _root_.scalapb.descriptors.PRepeated(fieldTransformations.iterator.map(_.toPMessage).toVector) - case 26 => ignoreFieldTransformations.map(_root_.scalapb.descriptors.PBoolean(_)).getOrElse(_root_.scalapb.descriptors.PEmpty) + case 26 => ignoreAllTransformations.map(_root_.scalapb.descriptors.PBoolean(_)).getOrElse(_root_.scalapb.descriptors.PEmpty) case 999 => testOnlyNoJavaConversions.map(_root_.scalapb.descriptors.PBoolean(_)).getOrElse(_root_.scalapb.descriptors.PEmpty) } } @@ -506,7 +506,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType = __fieldsMap.get(scalaDescriptor.findFieldByNumber(21).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Predef.String]]), preprocessors = __fieldsMap.get(scalaDescriptor.findFieldByNumber(24).get).map(_.as[_root_.scala.Seq[_root_.scala.Predef.String]]).getOrElse(_root_.scala.Seq.empty), fieldTransformations = __fieldsMap.get(scalaDescriptor.findFieldByNumber(25).get).map(_.as[_root_.scala.Seq[scalapb.options.FieldTransformation]]).getOrElse(_root_.scala.Seq.empty), - ignoreFieldTransformations = __fieldsMap.get(scalaDescriptor.findFieldByNumber(26).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Boolean]]), + ignoreAllTransformations = __fieldsMap.get(scalaDescriptor.findFieldByNumber(26).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Boolean]]), testOnlyNoJavaConversions = __fieldsMap.get(scalaDescriptor.findFieldByNumber(999).get).flatMap(_.as[_root_.scala.Option[_root_.scala.Boolean]]) ) case _ => throw new RuntimeException("Expected PMessage") @@ -559,7 +559,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType = _root_.scala.None, preprocessors = _root_.scala.Seq.empty, fieldTransformations = _root_.scala.Seq.empty, - ignoreFieldTransformations = _root_.scala.None, + ignoreAllTransformations = _root_.scala.None, testOnlyNoJavaConversions = _root_.scala.None ) final class Builder private ( @@ -586,7 +586,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. private var __bytesType: _root_.scala.Option[_root_.scala.Predef.String], private val __preprocessors: _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String], private val __fieldTransformations: _root_.scala.collection.immutable.VectorBuilder[scalapb.options.FieldTransformation], - private var __ignoreFieldTransformations: _root_.scala.Option[_root_.scala.Boolean], + private var __ignoreAllTransformations: _root_.scala.Option[_root_.scala.Boolean], private var __testOnlyNoJavaConversions: _root_.scala.Option[_root_.scala.Boolean], private var `_unknownFields__`: _root_.scalapb.UnknownFieldSet.Builder ) extends _root_.scalapb.MessageBuilder[scalapb.options.ScalaPbOptions] { @@ -643,7 +643,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. case 202 => __fieldTransformations += _root_.scalapb.LiteParser.readMessage[scalapb.options.FieldTransformation](_input__) case 208 => - __ignoreFieldTransformations = Option(_input__.readBool()) + __ignoreAllTransformations = Option(_input__.readBool()) case 7992 => __testOnlyNoJavaConversions = Option(_input__.readBool()) case tag => @@ -680,7 +680,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType = __bytesType, preprocessors = __preprocessors.result(), fieldTransformations = __fieldTransformations.result(), - ignoreFieldTransformations = __ignoreFieldTransformations, + ignoreAllTransformations = __ignoreAllTransformations, testOnlyNoJavaConversions = __testOnlyNoJavaConversions, unknownFields = if (_unknownFields__ == null) _root_.scalapb.UnknownFieldSet.empty else _unknownFields__.result() ) @@ -711,7 +711,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. __bytesType = _root_.scala.None, __preprocessors = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String], __fieldTransformations = new _root_.scala.collection.immutable.VectorBuilder[scalapb.options.FieldTransformation], - __ignoreFieldTransformations = _root_.scala.None, + __ignoreAllTransformations = _root_.scala.None, __testOnlyNoJavaConversions = _root_.scala.None, `_unknownFields__` = null ) @@ -739,7 +739,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. __bytesType = _message__.bytesType, __preprocessors = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] ++= _message__.preprocessors, __fieldTransformations = new _root_.scala.collection.immutable.VectorBuilder[scalapb.options.FieldTransformation] ++= _message__.fieldTransformations, - __ignoreFieldTransformations = _message__.ignoreFieldTransformations, + __ignoreAllTransformations = _message__.ignoreAllTransformations, __testOnlyNoJavaConversions = _message__.testOnlyNoJavaConversions, `_unknownFields__` = new _root_.scalapb.UnknownFieldSet.Builder(_message__.unknownFields) ) @@ -1379,8 +1379,8 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. def optionalBytesType: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Predef.String]] = field(_.bytesType)((c_, f_) => c_.copy(bytesType = f_)) def preprocessors: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.preprocessors)((c_, f_) => c_.copy(preprocessors = f_)) def fieldTransformations: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[scalapb.options.FieldTransformation]] = field(_.fieldTransformations)((c_, f_) => c_.copy(fieldTransformations = f_)) - def ignoreFieldTransformations: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getIgnoreFieldTransformations)((c_, f_) => c_.copy(ignoreFieldTransformations = Option(f_))) - def optionalIgnoreFieldTransformations: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.ignoreFieldTransformations)((c_, f_) => c_.copy(ignoreFieldTransformations = f_)) + def ignoreAllTransformations: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getIgnoreAllTransformations)((c_, f_) => c_.copy(ignoreAllTransformations = Option(f_))) + def optionalIgnoreAllTransformations: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.ignoreAllTransformations)((c_, f_) => c_.copy(ignoreAllTransformations = f_)) def testOnlyNoJavaConversions: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.getTestOnlyNoJavaConversions)((c_, f_) => c_.copy(testOnlyNoJavaConversions = Option(f_))) def optionalTestOnlyNoJavaConversions: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[_root_.scala.Boolean]] = field(_.testOnlyNoJavaConversions)((c_, f_) => c_.copy(testOnlyNoJavaConversions = f_)) } @@ -1407,7 +1407,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. final val BYTES_TYPE_FIELD_NUMBER = 21 final val PREPROCESSORS_FIELD_NUMBER = 24 final val FIELD_TRANSFORMATIONS_FIELD_NUMBER = 25 - final val IGNORE_FIELD_TRANSFORMATIONS_FIELD_NUMBER = 26 + final val IGNORE_ALL_TRANSFORMATIONS_FIELD_NUMBER = 26 final val TEST_ONLY_NO_JAVA_CONVERSIONS_FIELD_NUMBER = 999 def of( packageName: _root_.scala.Option[_root_.scala.Predef.String], @@ -1433,7 +1433,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType: _root_.scala.Option[_root_.scala.Predef.String], preprocessors: _root_.scala.Seq[_root_.scala.Predef.String], fieldTransformations: _root_.scala.Seq[scalapb.options.FieldTransformation], - ignoreFieldTransformations: _root_.scala.Option[_root_.scala.Boolean], + ignoreAllTransformations: _root_.scala.Option[_root_.scala.Boolean], testOnlyNoJavaConversions: _root_.scala.Option[_root_.scala.Boolean] ): _root_.scalapb.options.ScalaPbOptions = _root_.scalapb.options.ScalaPbOptions( packageName, @@ -1459,7 +1459,7 @@ object ScalaPbOptions extends scalapb.GeneratedMessageCompanion[scalapb.options. bytesType, preprocessors, fieldTransformations, - ignoreFieldTransformations, + ignoreAllTransformations, testOnlyNoJavaConversions ) // @@protoc_insertion_point(GeneratedMessageCompanion[scalapb.ScalaPbOptions]) diff --git a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalapbProto.scala b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalapbProto.scala index 666246517..204996835 100644 --- a/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalapbProto.scala +++ b/scalapb-runtime/shared/src/main/scala/scalapb/options/ScalapbProto.scala @@ -23,7 +23,7 @@ object ScalapbProto extends _root_.scalapb.GeneratedFileObject { ) private lazy val ProtoBytes: Array[Byte] = scalapb.Encoding.fromBase64(scala.collection.immutable.Seq( - """ChVzY2FsYXBiL3NjYWxhcGIucHJvdG8SB3NjYWxhcGIaIGdvb2dsZS9wcm90b2J1Zi9kZXNjcmlwdG9yLnByb3RvIqMSCg5TY + """ChVzY2FsYXBiL3NjYWxhcGIucHJvdG8SB3NjYWxhcGIaIGdvb2dsZS9wcm90b2J1Zi9kZXNjcmlwdG9yLnByb3RvIp0SCg5TY 2FsYVBiT3B0aW9ucxIzCgxwYWNrYWdlX25hbWUYASABKAlCEOI/DRILcGFja2FnZU5hbWVSC3BhY2thZ2VOYW1lEjMKDGZsYXRfc GFja2FnZRgCIAEoCEIQ4j8NEgtmbGF0UGFja2FnZVILZmxhdFBhY2thZ2USIwoGaW1wb3J0GAMgAygJQgviPwgSBmltcG9ydFIGa W1wb3J0EikKCHByZWFtYmxlGAQgAygJQg3iPwoSCHByZWFtYmxlUghwcmVhbWJsZRIwCgtzaW5nbGVfZmlsZRgFIAEoCEIP4j8ME @@ -46,50 +46,50 @@ object ScalapbProto extends _root_.scalapb.GeneratedFileObject { W1PcHRpb25zUg5hdXhFbnVtT3B0aW9ucxItCgpieXRlc190eXBlGBUgASgJQg7iPwsSCWJ5dGVzVHlwZVIJYnl0ZXNUeXBlEjgKD XByZXByb2Nlc3NvcnMYGCADKAlCEuI/DxINcHJlcHJvY2Vzc29yc1INcHJlcHJvY2Vzc29ycxJsChVmaWVsZF90cmFuc2Zvcm1hd GlvbnMYGSADKAsyHC5zY2FsYXBiLkZpZWxkVHJhbnNmb3JtYXRpb25CGeI/FhIUZmllbGRUcmFuc2Zvcm1hdGlvbnNSFGZpZWxkV - HJhbnNmb3JtYXRpb25zEmEKHGlnbm9yZV9maWVsZF90cmFuc2Zvcm1hdGlvbnMYGiABKAhCH+I/HBIaaWdub3JlRmllbGRUcmFuc - 2Zvcm1hdGlvbnNSGmlnbm9yZUZpZWxkVHJhbnNmb3JtYXRpb25zEmEKHXRlc3Rfb25seV9ub19qYXZhX2NvbnZlcnNpb25zGOcHI - AEoCEIe4j8bEhl0ZXN0T25seU5vSmF2YUNvbnZlcnNpb25zUhl0ZXN0T25seU5vSmF2YUNvbnZlcnNpb25zGnkKEUF1eE1lc3NhZ - 2VPcHRpb25zEiMKBnRhcmdldBgBIAEoCUIL4j8IEgZ0YXJnZXRSBnRhcmdldBI/CgdvcHRpb25zGAIgASgLMhcuc2NhbGFwYi5NZ - XNzYWdlT3B0aW9uc0IM4j8JEgdvcHRpb25zUgdvcHRpb25zGnUKD0F1eEZpZWxkT3B0aW9ucxIjCgZ0YXJnZXQYASABKAlCC+I/C - BIGdGFyZ2V0UgZ0YXJnZXQSPQoHb3B0aW9ucxgCIAEoCzIVLnNjYWxhcGIuRmllbGRPcHRpb25zQgziPwkSB29wdGlvbnNSB29wd - GlvbnMacwoOQXV4RW51bU9wdGlvbnMSIwoGdGFyZ2V0GAEgASgJQgviPwgSBnRhcmdldFIGdGFyZ2V0EjwKB29wdGlvbnMYAiABK - AsyFC5zY2FsYXBiLkVudW1PcHRpb25zQgziPwkSB29wdGlvbnNSB29wdGlvbnMiJQoMT3B0aW9uc1Njb3BlEggKBEZJTEUQABILC - gdQQUNLQUdFEAEiMgoPRW51bVZhbHVlTmFtaW5nEg8KC0FTX0lOX1BST1RPEAASDgoKQ0FNRUxfQ0FTRRABKgkI6AcQgICAgAJKB - AgWEBdKBAgXEBgi9QMKDk1lc3NhZ2VPcHRpb25zEiYKB2V4dGVuZHMYASADKAlCDOI/CRIHZXh0ZW5kc1IHZXh0ZW5kcxJCChFjb - 21wYW5pb25fZXh0ZW5kcxgCIAMoCUIV4j8SEhBjb21wYW5pb25FeHRlbmRzUhBjb21wYW5pb25FeHRlbmRzEjIKC2Fubm90YXRpb - 25zGAMgAygJQhDiPw0SC2Fubm90YXRpb25zUgthbm5vdGF0aW9ucxIdCgR0eXBlGAQgASgJQgniPwYSBHR5cGVSBHR5cGUSTgoVY - 29tcGFuaW9uX2Fubm90YXRpb25zGAUgAygJQhniPxYSFGNvbXBhbmlvbkFubm90YXRpb25zUhRjb21wYW5pb25Bbm5vdGF0aW9uc - xJJChRzZWFsZWRfb25lb2ZfZXh0ZW5kcxgGIAMoCUIX4j8UEhJzZWFsZWRPbmVvZkV4dGVuZHNSEnNlYWxlZE9uZW9mRXh0ZW5kc - xIhCgZub19ib3gYByABKAhCCuI/BxIFbm9Cb3hSBW5vQm94ElsKGnVua25vd25fZmllbGRzX2Fubm90YXRpb25zGAggAygJQh3iP - xoSGHVua25vd25GaWVsZHNBbm5vdGF0aW9uc1IYdW5rbm93bkZpZWxkc0Fubm90YXRpb25zKgkI6AcQgICAgAIifwoKQ29sbGVjd - GlvbhIdCgR0eXBlGAEgASgJQgniPwYSBHR5cGVSBHR5cGUSKgoJbm9uX2VtcHR5GAIgASgIQg3iPwoSCG5vbkVtcHR5Ughub25Fb - XB0eRImCgdhZGFwdGVyGAMgASgJQgziPwkSB2FkYXB0ZXJSB2FkYXB0ZXIi7gMKDEZpZWxkT3B0aW9ucxIdCgR0eXBlGAEgASgJQ - gniPwYSBHR5cGVSBHR5cGUSLQoKc2NhbGFfbmFtZRgCIAEoCUIO4j8LEglzY2FsYU5hbWVSCXNjYWxhTmFtZRI8Cg9jb2xsZWN0a - W9uX3R5cGUYAyABKAlCE+I/EBIOY29sbGVjdGlvblR5cGVSDmNvbGxlY3Rpb25UeXBlEkQKCmNvbGxlY3Rpb24YCCABKAsyEy5zY - 2FsYXBiLkNvbGxlY3Rpb25CD+I/DBIKY29sbGVjdGlvblIKY29sbGVjdGlvbhInCghrZXlfdHlwZRgEIAEoCUIM4j8JEgdrZXlUe - XBlUgdrZXlUeXBlEi0KCnZhbHVlX3R5cGUYBSABKAlCDuI/CxIJdmFsdWVUeXBlUgl2YWx1ZVR5cGUSMgoLYW5ub3RhdGlvbnMYB - iADKAlCEOI/DRILYW5ub3RhdGlvbnNSC2Fubm90YXRpb25zEicKCG1hcF90eXBlGAcgASgJQgziPwkSB21hcFR5cGVSB21hcFR5c - GUSIQoGbm9fYm94GB4gASgIQgriPwcSBW5vQm94UgVub0JveBIpCghyZXF1aXJlZBgfIAEoCEIN4j8KEghyZXF1aXJlZFIIcmVxd - WlyZWQqCQjoBxCAgICAAiKjAQoLRW51bU9wdGlvbnMSJgoHZXh0ZW5kcxgBIAMoCUIM4j8JEgdleHRlbmRzUgdleHRlbmRzEkIKE - WNvbXBhbmlvbl9leHRlbmRzGAIgAygJQhXiPxISEGNvbXBhbmlvbkV4dGVuZHNSEGNvbXBhbmlvbkV4dGVuZHMSHQoEdHlwZRgDI - AEoCUIJ4j8GEgR0eXBlUgR0eXBlKgkI6AcQgICAgAIidAoQRW51bVZhbHVlT3B0aW9ucxImCgdleHRlbmRzGAEgAygJQgziPwkSB - 2V4dGVuZHNSB2V4dGVuZHMSLQoKc2NhbGFfbmFtZRgCIAEoCUIO4j8LEglzY2FsYU5hbWVSCXNjYWxhTmFtZSoJCOgHEICAgIACI - kEKDE9uZW9mT3B0aW9ucxImCgdleHRlbmRzGAEgAygJQgziPwkSB2V4dGVuZHNSB2V4dGVuZHMqCQjoBxCAgICAAiKbAgoTRmllb - GRUcmFuc2Zvcm1hdGlvbhI8CgR3aGVuGAEgASgLMh0uZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9uc0IJ4j8GEgR3aGVuUgR3a - GVuEl8KCm1hdGNoX3R5cGUYAiABKA4yJi5zY2FsYXBiLkZpZWxkVHJhbnNmb3JtYXRpb24uTWF0Y2hUeXBlOghDT05UQUlOU0IO4 - j8LEgltYXRjaFR5cGVSCW1hdGNoVHlwZRIxCgNzZXQYAyABKAsyFS5zY2FsYXBiLkZpZWxkT3B0aW9uc0II4j8FEgNzZXRSA3Nld - CIyCglNYXRjaFR5cGUSDAoIQ09OVEFJTlMQABIJCgVFWEFDVBABEgwKCFBSRVNFTkNFEAIi8QEKElByZXByb2Nlc3Nvck91dHB1d - BJqCg9vcHRpb25zX2J5X2ZpbGUYASADKAsyLi5zY2FsYXBiLlByZXByb2Nlc3Nvck91dHB1dC5PcHRpb25zQnlGaWxlRW50cnlCE - uI/DxINb3B0aW9uc0J5RmlsZVINb3B0aW9uc0J5RmlsZRpvChJPcHRpb25zQnlGaWxlRW50cnkSGgoDa2V5GAEgASgJQgjiPwUSA - 2tleVIDa2V5EjkKBXZhbHVlGAIgASgLMhcuc2NhbGFwYi5TY2FsYVBiT3B0aW9uc0IK4j8HEgV2YWx1ZVIFdmFsdWU6AjgBOlAKB - 29wdGlvbnMSHC5nb29nbGUucHJvdG9idWYuRmlsZU9wdGlvbnMY/AcgASgLMhcuc2NhbGFwYi5TY2FsYVBiT3B0aW9uc1IHb3B0a - W9uczpTCgdtZXNzYWdlEh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRpb25zGPwHIAEoCzIXLnNjYWxhcGIuTWVzc2FnZU9wd - GlvbnNSB21lc3NhZ2U6SwoFZmllbGQSHS5nb29nbGUucHJvdG9idWYuRmllbGRPcHRpb25zGPwHIAEoCzIVLnNjYWxhcGIuRmllb - GRPcHRpb25zUgVmaWVsZDpWCgxlbnVtX29wdGlvbnMSHC5nb29nbGUucHJvdG9idWYuRW51bU9wdGlvbnMY/AcgASgLMhQuc2Nhb - GFwYi5FbnVtT3B0aW9uc1ILZW51bU9wdGlvbnM6XAoKZW51bV92YWx1ZRIhLmdvb2dsZS5wcm90b2J1Zi5FbnVtVmFsdWVPcHRpb - 25zGPwHIAEoCzIZLnNjYWxhcGIuRW51bVZhbHVlT3B0aW9uc1IJZW51bVZhbHVlOksKBW9uZW9mEh0uZ29vZ2xlLnByb3RvYnVmL - k9uZW9mT3B0aW9ucxj8ByABKAsyFS5zY2FsYXBiLk9uZW9mT3B0aW9uc1IFb25lb2ZCJwoPc2NhbGFwYi5vcHRpb25z4j8TCg9zY - 2FsYXBiLm9wdGlvbnMQAQ==""" + HJhbnNmb3JtYXRpb25zElsKGmlnbm9yZV9hbGxfdHJhbnNmb3JtYXRpb25zGBogASgIQh3iPxoSGGlnbm9yZUFsbFRyYW5zZm9yb + WF0aW9uc1IYaWdub3JlQWxsVHJhbnNmb3JtYXRpb25zEmEKHXRlc3Rfb25seV9ub19qYXZhX2NvbnZlcnNpb25zGOcHIAEoCEIe4 + j8bEhl0ZXN0T25seU5vSmF2YUNvbnZlcnNpb25zUhl0ZXN0T25seU5vSmF2YUNvbnZlcnNpb25zGnkKEUF1eE1lc3NhZ2VPcHRpb + 25zEiMKBnRhcmdldBgBIAEoCUIL4j8IEgZ0YXJnZXRSBnRhcmdldBI/CgdvcHRpb25zGAIgASgLMhcuc2NhbGFwYi5NZXNzYWdlT + 3B0aW9uc0IM4j8JEgdvcHRpb25zUgdvcHRpb25zGnUKD0F1eEZpZWxkT3B0aW9ucxIjCgZ0YXJnZXQYASABKAlCC+I/CBIGdGFyZ + 2V0UgZ0YXJnZXQSPQoHb3B0aW9ucxgCIAEoCzIVLnNjYWxhcGIuRmllbGRPcHRpb25zQgziPwkSB29wdGlvbnNSB29wdGlvbnMac + woOQXV4RW51bU9wdGlvbnMSIwoGdGFyZ2V0GAEgASgJQgviPwgSBnRhcmdldFIGdGFyZ2V0EjwKB29wdGlvbnMYAiABKAsyFC5zY + 2FsYXBiLkVudW1PcHRpb25zQgziPwkSB29wdGlvbnNSB29wdGlvbnMiJQoMT3B0aW9uc1Njb3BlEggKBEZJTEUQABILCgdQQUNLQ + UdFEAEiMgoPRW51bVZhbHVlTmFtaW5nEg8KC0FTX0lOX1BST1RPEAASDgoKQ0FNRUxfQ0FTRRABKgkI6AcQgICAgAJKBAgWEBdKB + AgXEBgi9QMKDk1lc3NhZ2VPcHRpb25zEiYKB2V4dGVuZHMYASADKAlCDOI/CRIHZXh0ZW5kc1IHZXh0ZW5kcxJCChFjb21wYW5pb + 25fZXh0ZW5kcxgCIAMoCUIV4j8SEhBjb21wYW5pb25FeHRlbmRzUhBjb21wYW5pb25FeHRlbmRzEjIKC2Fubm90YXRpb25zGAMgA + ygJQhDiPw0SC2Fubm90YXRpb25zUgthbm5vdGF0aW9ucxIdCgR0eXBlGAQgASgJQgniPwYSBHR5cGVSBHR5cGUSTgoVY29tcGFua + W9uX2Fubm90YXRpb25zGAUgAygJQhniPxYSFGNvbXBhbmlvbkFubm90YXRpb25zUhRjb21wYW5pb25Bbm5vdGF0aW9ucxJJChRzZ + WFsZWRfb25lb2ZfZXh0ZW5kcxgGIAMoCUIX4j8UEhJzZWFsZWRPbmVvZkV4dGVuZHNSEnNlYWxlZE9uZW9mRXh0ZW5kcxIhCgZub + 19ib3gYByABKAhCCuI/BxIFbm9Cb3hSBW5vQm94ElsKGnVua25vd25fZmllbGRzX2Fubm90YXRpb25zGAggAygJQh3iPxoSGHVua + 25vd25GaWVsZHNBbm5vdGF0aW9uc1IYdW5rbm93bkZpZWxkc0Fubm90YXRpb25zKgkI6AcQgICAgAIifwoKQ29sbGVjdGlvbhIdC + gR0eXBlGAEgASgJQgniPwYSBHR5cGVSBHR5cGUSKgoJbm9uX2VtcHR5GAIgASgIQg3iPwoSCG5vbkVtcHR5Ughub25FbXB0eRImC + gdhZGFwdGVyGAMgASgJQgziPwkSB2FkYXB0ZXJSB2FkYXB0ZXIi7gMKDEZpZWxkT3B0aW9ucxIdCgR0eXBlGAEgASgJQgniPwYSB + HR5cGVSBHR5cGUSLQoKc2NhbGFfbmFtZRgCIAEoCUIO4j8LEglzY2FsYU5hbWVSCXNjYWxhTmFtZRI8Cg9jb2xsZWN0aW9uX3R5c + GUYAyABKAlCE+I/EBIOY29sbGVjdGlvblR5cGVSDmNvbGxlY3Rpb25UeXBlEkQKCmNvbGxlY3Rpb24YCCABKAsyEy5zY2FsYXBiL + kNvbGxlY3Rpb25CD+I/DBIKY29sbGVjdGlvblIKY29sbGVjdGlvbhInCghrZXlfdHlwZRgEIAEoCUIM4j8JEgdrZXlUeXBlUgdrZ + XlUeXBlEi0KCnZhbHVlX3R5cGUYBSABKAlCDuI/CxIJdmFsdWVUeXBlUgl2YWx1ZVR5cGUSMgoLYW5ub3RhdGlvbnMYBiADKAlCE + OI/DRILYW5ub3RhdGlvbnNSC2Fubm90YXRpb25zEicKCG1hcF90eXBlGAcgASgJQgziPwkSB21hcFR5cGVSB21hcFR5cGUSIQoGb + m9fYm94GB4gASgIQgriPwcSBW5vQm94UgVub0JveBIpCghyZXF1aXJlZBgfIAEoCEIN4j8KEghyZXF1aXJlZFIIcmVxdWlyZWQqC + QjoBxCAgICAAiKjAQoLRW51bU9wdGlvbnMSJgoHZXh0ZW5kcxgBIAMoCUIM4j8JEgdleHRlbmRzUgdleHRlbmRzEkIKEWNvbXBhb + mlvbl9leHRlbmRzGAIgAygJQhXiPxISEGNvbXBhbmlvbkV4dGVuZHNSEGNvbXBhbmlvbkV4dGVuZHMSHQoEdHlwZRgDIAEoCUIJ4 + j8GEgR0eXBlUgR0eXBlKgkI6AcQgICAgAIidAoQRW51bVZhbHVlT3B0aW9ucxImCgdleHRlbmRzGAEgAygJQgziPwkSB2V4dGVuZ + HNSB2V4dGVuZHMSLQoKc2NhbGFfbmFtZRgCIAEoCUIO4j8LEglzY2FsYU5hbWVSCXNjYWxhTmFtZSoJCOgHEICAgIACIkEKDE9uZ + W9mT3B0aW9ucxImCgdleHRlbmRzGAEgAygJQgziPwkSB2V4dGVuZHNSB2V4dGVuZHMqCQjoBxCAgICAAiKbAgoTRmllbGRUcmFuc + 2Zvcm1hdGlvbhI8CgR3aGVuGAEgASgLMh0uZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9uc0IJ4j8GEgR3aGVuUgR3aGVuEl8KC + m1hdGNoX3R5cGUYAiABKA4yJi5zY2FsYXBiLkZpZWxkVHJhbnNmb3JtYXRpb24uTWF0Y2hUeXBlOghDT05UQUlOU0IO4j8LEgltY + XRjaFR5cGVSCW1hdGNoVHlwZRIxCgNzZXQYAyABKAsyFS5zY2FsYXBiLkZpZWxkT3B0aW9uc0II4j8FEgNzZXRSA3NldCIyCglNY + XRjaFR5cGUSDAoIQ09OVEFJTlMQABIJCgVFWEFDVBABEgwKCFBSRVNFTkNFEAIi8QEKElByZXByb2Nlc3Nvck91dHB1dBJqCg9vc + HRpb25zX2J5X2ZpbGUYASADKAsyLi5zY2FsYXBiLlByZXByb2Nlc3Nvck91dHB1dC5PcHRpb25zQnlGaWxlRW50cnlCEuI/DxINb + 3B0aW9uc0J5RmlsZVINb3B0aW9uc0J5RmlsZRpvChJPcHRpb25zQnlGaWxlRW50cnkSGgoDa2V5GAEgASgJQgjiPwUSA2tleVIDa + 2V5EjkKBXZhbHVlGAIgASgLMhcuc2NhbGFwYi5TY2FsYVBiT3B0aW9uc0IK4j8HEgV2YWx1ZVIFdmFsdWU6AjgBOlAKB29wdGlvb + nMSHC5nb29nbGUucHJvdG9idWYuRmlsZU9wdGlvbnMY/AcgASgLMhcuc2NhbGFwYi5TY2FsYVBiT3B0aW9uc1IHb3B0aW9uczpTC + gdtZXNzYWdlEh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRpb25zGPwHIAEoCzIXLnNjYWxhcGIuTWVzc2FnZU9wdGlvbnNSB + 21lc3NhZ2U6SwoFZmllbGQSHS5nb29nbGUucHJvdG9idWYuRmllbGRPcHRpb25zGPwHIAEoCzIVLnNjYWxhcGIuRmllbGRPcHRpb + 25zUgVmaWVsZDpWCgxlbnVtX29wdGlvbnMSHC5nb29nbGUucHJvdG9idWYuRW51bU9wdGlvbnMY/AcgASgLMhQuc2NhbGFwYi5Fb + nVtT3B0aW9uc1ILZW51bU9wdGlvbnM6XAoKZW51bV92YWx1ZRIhLmdvb2dsZS5wcm90b2J1Zi5FbnVtVmFsdWVPcHRpb25zGPwHI + AEoCzIZLnNjYWxhcGIuRW51bVZhbHVlT3B0aW9uc1IJZW51bVZhbHVlOksKBW9uZW9mEh0uZ29vZ2xlLnByb3RvYnVmLk9uZW9mT + 3B0aW9ucxj8ByABKAsyFS5zY2FsYXBiLk9uZW9mT3B0aW9uc1IFb25lb2ZCJwoPc2NhbGFwYi5vcHRpb25z4j8TCg9zY2FsYXBiL + m9wdGlvbnMQAQ==""" ).mkString) lazy val scalaDescriptor: _root_.scalapb.descriptors.FileDescriptor = { val scalaProto = com.google.protobuf.descriptor.FileDescriptorProto.parseFrom(ProtoBytes)