Wrap coproducts in Option #198
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is for compatibility with pbdirect. See 47degrees/pbdirect#30
This way it only affects schemas produced from a protobuf definition, not all schemas.
cb372
commented
Jan 2, 2020
| @@ -50,7 +50,7 @@ object Transform { | |||
| case ProtobufF.TEnum(name, symbols, _, _) => TSum(name, symbols.map(SumField.tupled)) | |||
| case ProtobufF.TMessage(name, fields, _) => TProduct(name, fields.map(f => Field(f.name, f.tpe, f.indices))) | |||
| case ProtobufF.TFileDescriptor(values, _, _) => TContaining(values) | |||
| case ProtobufF.TOneOf(_, fields) => TCoproduct(fields.map(_.tpe)) | |||
| case ProtobufF.TOneOf(_, fields) => TOption(A.algebra(TCoproduct(fields.map(_.tpe)))) | |||
There was a problem hiding this comment.
Sorry for the noisy diff. This is one of the actual changes.
cb372
commented
Jan 2, 2020
| @@ -197,7 +197,7 @@ object ParseProto { | |||
| FieldF.Field( | |||
| name = field.getName, | |||
| position = field.getNumber, | |||
| tpe = repeated[A](fromFieldType(field, files, makeNamedTypesOptional = true)).embed, | |||
| tpe = repeated[A](fromFieldType(field, files, makeNamedTypesOptional = false)).embed, | |||
cb372
commented
Jan 2, 2020
| @@ -83,7 +83,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck { | |||
| |@message final case class Book( | |||
| | @_root_.pbdirect.pbIndex(1) isbn: _root_.scala.Long, | |||
| | @_root_.pbdirect.pbIndex(2) title: _root_.java.lang.String, | |||
| | @_root_.pbdirect.pbIndex(3) author: _root_.scala.List[_root_.scala.Option[_root_.com.acme.author.Author]], | |||
| | @_root_.pbdirect.pbIndex(3) author: _root_.scala.List[_root_.com.acme.author.Author], | |||
juanpedromoreno
approved these changes
Jan 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is so they can be encoded as
oneoffields in protobuf using pbdirect (see 47degrees/pbdirect#30).Also stop wrapping repeated field elements in Option when parsing protobuf protocols.