[Protobuf] Improve oneOf Handling by Unwrapping allOf for Complex Types#22700
Merged
wing328 merged 2 commits intoOpenAPITools:masterfrom Jan 19, 2026
Merged
Conversation
There was a problem hiding this comment.
1 issue found across 3 files
Prompt for AI agents (all issues)
Check if these issues are valid — if so, understand the root cause of each and fix them.
<file name="modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java">
<violation number="1" location="modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java:192">
P2: Test does not fail for unexpected var names; missing else/set-membership assertion allows false positives.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
...api-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java
Show resolved
Hide resolved
Member
|
circleci failure not related to this change |
Member
|
thanks for the PR let's give it a try in the next release (v7.20.0) i may add an option to opt out of the allOf normalization to handle $ref with sibling properties in 3.1 spec as not all generators can handle such case at the moment |
This file contains hidden or 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
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.
The OpenAPI Normalizer wraps $ref with sibling properties (title, description) inside allOf constructs. The Protobuf generator wasn't properly unwrapping these single-item allOf containers, causing issues when handling complex types within oneOf.
expected:
solution:
Unwrap single-item allOf: If the resolved schema is allOf with exactly one item, unwrap it.
PR checklist
Commit all changed files.
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*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
master(upcoming7.x.0minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)"fixes #123"present in the PR description)