loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(csharp): Fixed JsonConverter for discriminators only appearing on base classes (#19972)

Browse Source 
* fix(csharp): Fixed JsonConverter for discriminators only appearing on base classes

* chore: Updated .NET samples
This commit is contained in:
DaveK-Rocketmakers 2024-11-09 05:55:02 +00:00 committed by GitHub
parent 5702751e91
commit d9229c7b9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache vendored
View File

@ -34,7 +34,9 @@ namespace {{modelPackage}}
[DataContract] [DataContract]
{{#discriminator}} {{#discriminator}}
{{#useNewtonsoft}} {{#useNewtonsoft}}
{{#mappedModels.size}}
[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
{{/mappedModels.size}}
{{/useNewtonsoft}} {{/useNewtonsoft}}
{{#useSwashbuckle}} {{#useSwashbuckle}}
[SwaggerDiscriminator("{{{discriminatorName}}}")] [SwaggerDiscriminator("{{{discriminatorName}}}")]

2
modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache vendored
View File

@ -3,7 +3,9 @@
/// </summary> /// </summary>
[DataContract(Name = "{{{name}}}")] [DataContract(Name = "{{{name}}}")]
{{#discriminator}} {{#discriminator}}
{{#mappedModels.size}}
[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
{{/mappedModels.size}}
{{#mappedModels}} {{#mappedModels}}
[JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")] [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
{{/mappedModels}} {{/mappedModels}}

2
modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache vendored
View File

@ -10,7 +10,9 @@
[DataContract(Name = "{{{name}}}")] [DataContract(Name = "{{{name}}}")]
{{^useUnityWebRequest}} {{^useUnityWebRequest}}
{{#discriminator}} {{#discriminator}}
{{#mappedModels.size}}
[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
{{/mappedModels.size}}
{{#mappedModels}} {{#mappedModels}}
[JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")] [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
{{/mappedModels}} {{/mappedModels}}

1
samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Cat /// Cat
/// </summary> /// </summary>
[DataContract(Name = "Cat")] [DataContract(Name = "Cat")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// ChildCat /// ChildCat
/// </summary> /// </summary>
[DataContract(Name = "ChildCat")] [DataContract(Name = "ChildCat")]
[JsonConverter(typeof(JsonSubtypes), "PetType")]
public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject public partial class ChildCat : ParentPet, IEquatable<ChildCat>, IValidatableObject
{ {
/// <summary> /// <summary>

1
samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -31,7 +31,6 @@ namespace Org.OpenAPITools.Model
/// Dog /// Dog
/// </summary> /// </summary>
[DataContract(Name = "Dog")] [DataContract(Name = "Dog")]
[JsonConverter(typeof(JsonSubtypes), "ClassName")]
public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
{ {
/// <summary> /// <summary>