Skip to content

[C#] Fixed valuetype parameters and discriminator deserialization #5680

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

Merged
wing328 merged 9 commits into from
Apr 29, 2020
Merged

[C#] Fixed valuetype parameters and discriminator deserialization #5680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
35e1e99
Fixed valuetype parameters and discriminator deserialization
gbrown-ce Mar 23, 2020
3afe020
Ran pet store sample script
gbrown-ce Mar 23, 2020
c735e51
Ensure that readWriteVars and readOnlyVars are also marked as isEnum …
gbrown-ce Mar 30, 2020
2f614f0
Updated petstore sample with enum fix
gbrown-ce Mar 30, 2020
5727fab
Fields that are required should emit default values (otherwise the co…
gbrown-ce Apr 2, 2020
ecabacf
Added missing sample updated
gbrown-ce Apr 23, 2020
722342a
Re-ran petstore example script to grab all changes
gbrown-ce Apr 24, 2020
cda3886
Rebased and re-ran example update script
gbrown-ce Apr 24, 2020
635d176
update csharp samples
wing328 Apr 27, 2020
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
Next Next commit
Fixed valuetype parameters and discriminator deserialization 
- Made non-required valuetypes nullable, and flagged required valuetypes as "x-csharp-value-type"
- Made sure to camelCase discriminator property names in Subtype converter
  • Loading branch information
@gbrown-ce
gbrown-ce committed Apr 24, 2020
commit 35e1e992d1836513479d8fdc91b964c84c07bc7e
12 changes: 12 additions & 0 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,13 +661,25 @@ public void postProcessParameter(CodegenParameter parameter) {
postProcessPattern(parameter.pattern, parameter.vendorExtensions);
postProcessEmitDefaultValue(parameter.vendorExtensions);
super.postProcessParameter(parameter);

if (nullableType.contains(parameter.dataType)) {
Copy link
Contributor Author

@gbrown-ce gbrown-ce Mar 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be noted that this code is just copied from the csharp-netcore generator and works properly there

if (!parameter.required) { //optional
parameter.dataType = parameter.dataType + "?";
} else {
parameter.vendorExtensions.put("x-csharp-value-type", true);
}
}
}

@Override
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
postProcessPattern(property.pattern, property.vendorExtensions);
postProcessEmitDefaultValue(property.vendorExtensions);
super.postProcessModelProperty(model, property);

if (!property.isContainer && (nullableType.contains(property.dataType) || property.isEnum)) {
Copy link
Contributor Author

@gbrown-ce gbrown-ce Mar 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be noted that this code is just copied from the csharp-netcore generator and works properly there

property.vendorExtensions.put("x-csharp-value-type", true);
}
}

/*
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// </summary>
[DataContract]
{{#discriminator}}
[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]{{#children}}
[JsonConverter(typeof(JsonSubtypes), "{{#lambda.camelcase_param}}{{{discriminatorName}}}{{/lambda.camelcase_param}}")]{{#children}}
Copy link
Contributor Author

@gbrown-ce gbrown-ce Mar 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now if this discriminator isn't camelCased it causes things to not deserialize properly when receiving them from an API (since the json is expected to come back camelcased)

[JsonSubtypes.KnownSubType(typeof({{classname}}), "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}")]{{/children}}
{{/discriminator}}
{{#generatePropertyChanged}}
Expand Down