Merged
requested to merge github/fork/OpenGuidou/Protobuf-generator-enhancements-for-AllOf into master
Created by: OpenGuidou
PR checklist
-
Read the contribution guidelines. -
Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community. -
If contributing template-only or documentation-only changes which will change sample output, build the project beforehand. -
Run the shell script ./bin/generate-samples.sh
to update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example./bin/generate-samples.sh bin/configs/java*
. For Windows users, please run the script in Git BASH. -
File the PR against the correct branch: master
-
Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
Description
This fix is in 2 steps:
Fixed index for vars in generated protobuf files
To ensure the backward compatibility between two schema generations, I'm fixing the index generated for each attribute base on its name.
Correct support of AllOf
As there is no inheritance in protobuf, the use case 3_0/allOf_composition_discriminator.yaml doesn't work. If the parent is referenced in the response, we can't use one of its children as instantiation (Dog for Pet for example). The only way to make it work is to replicate all attributes from the children in the parents, including imports.
Before the fix, the generated Pet was:
syntax = "proto3";
package somepackage;
message Pet {
string petType = 0;
}
After the fix:
syntax = "proto3";
package somepackage;
import public "models/lizard_all_of.proto";
import public "models/snake_all_of.proto";
import public "models/cat_all_of.proto";
import public "models/dog_all_of.proto";
message Pet {
string petType = 140636936;
bool hasLegs = 159828448;
bool lovesRocks = 499337491;
string name = 3373707;
string bark = 3016376;
}