Skip to content

[BUG] FIX protobuf-schema generator wraps standalone enums in message types but does not update field references #23559 #23675

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

Open
swapneswarsundarray wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BUG] FIX protobuf-schema generator wraps standalone enums in message types but does not update field references #23559 #23675

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
18 changes: 18 additions & 0 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,24 @@ public ModelsMap postProcessModels(ModelsMap objs) {
}
}

// Fix for enum wrapping when NOT extracting enums to separate files
// Since v7.20.0, all enums are wrapped in messages but field references
// weren't updated to use .Enum suffix when not extracted
boolean isDirectEnumForFix = property.isEnum;
boolean isArrayOfEnumsForFix = property.isArray && property.items != null && property.items.isEnum;

if ((isDirectEnumForFix || isArrayOfEnumsForFix) && !this.extractEnumsToSeparateFiles) {
// For enums that are wrapped but not extracted, update the data type to use .Enum suffix
CodegenProperty enumPropertyForFix = isArrayOfEnumsForFix ? property.items : property;
String enumTypeName = enumPropertyForFix.dataType;

if (StringUtils.isNotBlank(enumTypeName)) {
// Update x-protobuf-data-type to reference the wrapped enum's inner Enum
String wrappedEnumType = enumTypeName + "." + ENUM_WRAPPER_INNER_NAME;
property.vendorExtensions.put("x-protobuf-data-type", wrappedEnumType);
}
}

// Check if this property is an enum or an array of enums.
//
// This handles two distinct cases:
Expand Down