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

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
Prev Previous commit
Next Next commit
Ensure that readWriteVars and readOnlyVars are also marked as isEnum … 
…and isPrimitiveType where appropriate
  • Loading branch information
@gbrown-ce
gbrown-ce committed Apr 24, 2020
commit c735e51115e3424efd3e7975ef4ff2fee43c8907
26 changes: 26 additions & 0 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,32 @@ private void postProcessEnumRefs(final Map<String, Object> models) {
var.isPrimitiveType = true;
}
}
for (CodegenProperty var : model.readWriteVars) {
Copy link
Contributor Author

@gbrown-ce gbrown-ce Mar 30, 2020

Choose a reason for hiding this comment

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

Previously this only flagged things in the allVars array which are not actually references to the objecsts in the readWrite or readOnly arrays, so it was missing out on this decoration

if (enumRefs.containsKey(var.dataType)) {
// Handle any enum properties referred to by $ref.
// This is different in C# than most other generators, because enums in C# are compiled to integral types,
// while enums in many other languages are true objects.
CodegenModel refModel = enumRefs.get(var.dataType);
var.allowableValues = refModel.allowableValues;
var.isEnum = true;

// We do these after updateCodegenPropertyEnum to avoid generalities that don't mesh with C#.
var.isPrimitiveType = true;
}
}
for (CodegenProperty var : model.readOnlyVars) {
if (enumRefs.containsKey(var.dataType)) {
// Handle any enum properties referred to by $ref.
// This is different in C# than most other generators, because enums in C# are compiled to integral types,
// while enums in many other languages are true objects.
CodegenModel refModel = enumRefs.get(var.dataType);
var.allowableValues = refModel.allowableValues;
var.isEnum = true;

// We do these after updateCodegenPropertyEnum to avoid generalities that don't mesh with C#.
var.isPrimitiveType = true;
}
}

// We're looping all models here.
if (model.isEnum) {
Expand Down