Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support field extensions with use_allof_for_refs #3100

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −1
Open

Support field extensions with use_allof_for_refs #3100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion protoc-gen-openapiv2/internal/genopenapi/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,11 +520,12 @@ func renderMessageAsDefinition(msg *descriptor.Message, reg *descriptor.Registry
// Per the JSON Reference syntax: Any members other than "$ref" in a JSON Reference object SHALL be ignored.
// https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03#section-3
// However, use allOf to specify Title/Description/readOnly fields.
if fieldSchema.Title != "" || fieldSchema.Description != "" || fieldSchema.ReadOnly {
if fieldSchema.Title != "" || fieldSchema.Description != "" || fieldSchema.ReadOnly || len(fieldSchema.extensions) > 0 {
fieldSchema = openapiSchemaObject{
Title: fieldSchema.Title,
Description: fieldSchema.Description,
ReadOnly: fieldSchema.ReadOnly,
extensions: fieldSchema.extensions,
AllOf: []allOfEntry{{Ref: fieldSchema.Ref}},
}
} else {
Expand Down