From ea2c6860d3a3f36a542affddd0e39832f09a3513 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 25 Jun 2023 01:01:50 -0400 Subject: [PATCH] [csharp][generichost] Removed redundant properties (#15869) * removed redundant properties * removed commneted code * restored discriminator as a model property * build samples --- .../languages/AbstractCSharpCodegen.java | 5 + .../languages/CSharpClientCodegen.java | 36 ++++ .../docs/models/Fruit.md | 3 - .../docs/models/FruitReq.md | 4 - .../docs/models/GmFruit.md | 3 - .../docs/models/Mammal.md | 3 - .../docs/models/NullableShape.md | 1 - .../docs/models/Quadrilateral.md | 1 - .../docs/models/Shape.md | 1 - .../docs/models/ShapeOrNull.md | 1 - .../docs/models/Triangle.md | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../src/Org.OpenAPITools/Model/Fruit.cs | 80 +-------- .../src/Org.OpenAPITools/Model/FruitReq.cs | 89 +--------- .../src/Org.OpenAPITools/Model/GmFruit.cs | 70 +------- .../src/Org.OpenAPITools/Model/Mammal.cs | 165 +----------------- .../Org.OpenAPITools/Model/NullableShape.cs | 45 +---- .../Org.OpenAPITools/Model/Quadrilateral.cs | 27 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 45 +---- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 45 +---- .../src/Org.OpenAPITools/Model/Triangle.cs | 33 +--- .../docs/models/Fruit.md | 3 - .../docs/models/FruitReq.md | 4 - .../docs/models/GmFruit.md | 3 - .../docs/models/Mammal.md | 3 - .../docs/models/NullableShape.md | 1 - .../docs/models/Quadrilateral.md | 1 - .../docs/models/Shape.md | 1 - .../docs/models/ShapeOrNull.md | 1 - .../docs/models/Triangle.md | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../src/Org.OpenAPITools/Model/Fruit.cs | 80 +-------- .../src/Org.OpenAPITools/Model/FruitReq.cs | 89 +--------- .../src/Org.OpenAPITools/Model/GmFruit.cs | 70 +------- .../src/Org.OpenAPITools/Model/Mammal.cs | 165 +----------------- .../Org.OpenAPITools/Model/NullableShape.cs | 45 +---- .../Org.OpenAPITools/Model/Quadrilateral.cs | 27 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 45 +---- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 45 +---- .../src/Org.OpenAPITools/Model/Triangle.cs | 33 +--- .../docs/models/Fruit.md | 2 - .../src/Org.OpenAPITools/Model/Fruit.cs | 39 +---- .../docs/models/Fruit.md | 2 - .../src/Org.OpenAPITools/Model/Fruit.cs | 47 +---- .../docs/models/Fruit.md | 3 - .../docs/models/FruitReq.md | 4 - .../docs/models/GmFruit.md | 3 - .../docs/models/Mammal.md | 3 - .../docs/models/NullableShape.md | 1 - .../docs/models/Quadrilateral.md | 1 - .../docs/models/Shape.md | 1 - .../docs/models/ShapeOrNull.md | 1 - .../docs/models/Triangle.md | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../src/Org.OpenAPITools/Model/Fruit.cs | 80 +-------- .../src/Org.OpenAPITools/Model/FruitReq.cs | 89 +--------- .../src/Org.OpenAPITools/Model/GmFruit.cs | 70 +------- .../src/Org.OpenAPITools/Model/Mammal.cs | 165 +----------------- .../Org.OpenAPITools/Model/NullableShape.cs | 45 +---- .../Org.OpenAPITools/Model/Quadrilateral.cs | 27 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 45 +---- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 45 +---- .../src/Org.OpenAPITools/Model/Triangle.cs | 33 +--- 63 files changed, 161 insertions(+), 1827 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index dcb7ace6887..4dcbaa3078c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -506,6 +506,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co List anyOf = composedSchemas.getAnyOf(); if (anyOf != null) { + removePropertiesDeclaredInComposedTypes(objs, model, anyOf); for(CodegenProperty property : anyOf) { property.name = patchPropertyName(model, property.baseType); property.isNullable = true; @@ -514,6 +515,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co List oneOf = composedSchemas.getOneOf(); if (oneOf != null) { + removePropertiesDeclaredInComposedTypes(objs, model, oneOf); for(CodegenProperty property : oneOf) { property.name = patchPropertyName(model, property.baseType); property.isNullable = true; @@ -552,6 +554,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co return processed; } + protected void removePropertiesDeclaredInComposedTypes(Map objs, CodegenModel model, List composedProperties) { + } + private String patchPropertyName(CodegenModel model, String value) { // the casing will be wrong if we just set the name to escapeReservedWord // if we try to fix it with camelize, underscores get stripped out diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index d19af1e7340..6f195cdc4ae 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -1592,6 +1592,42 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { return objs; } + // https://github.com/OpenAPITools/openapi-generator/issues/15867 + @Override + protected void removePropertiesDeclaredInComposedTypes(Map objs, CodegenModel model, List composedProperties) { + if (!GENERICHOST.equals(getLibrary())) { + return; + } + + String discriminatorName = model.discriminator == null + ? null + : model.discriminator.getPropertyName(); + + for(CodegenProperty oneOfProperty : composedProperties) { + String ref = oneOfProperty.getRef(); + if (ref != null) { + for (Map.Entry composedEntry : objs.entrySet()) { + CodegenModel composedModel = ModelUtils.getModelByName(composedEntry.getKey(), objs); + if (ref.endsWith("/" + composedModel.name)) { + for (CodegenProperty composedProperty : composedModel.allVars) { + if (discriminatorName != null && composedProperty.name.equals(discriminatorName)) { + continue; + } + model.vars.removeIf(v -> v.name.equals(composedProperty.name)); + model.allVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.readOnlyVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.nonNullableVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.optionalVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.parentRequiredVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.readWriteVars.removeIf(v -> v.name.equals(composedProperty.name)); + model.requiredVars.removeIf(v -> v.name.equals(composedProperty.name)); + } + } + } + } + } + } + /** * Return true if the property being passed is a C# value type * diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md index 1a298dac767..b3bee18f7ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md index 5217febc9b6..38ab0c1a6ca 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md @@ -4,10 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Cultivar** | **string** | | -**LengthCm** | **decimal** | | -**Mealy** | **bool** | | [optional] -**Sweet** | **bool** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md index 49b24074b79..584c4fd323d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md index 82a8ca6027b..ac14f00c0ff 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | -**HasBaleen** | **bool** | | [optional] -**HasTeeth** | **bool** | | [optional] -**Type** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md index 948b6d047ce..2720167ccaa 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md index d1c44507419..fbbf4f81cec 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **QuadrilateralType** | **string** | | -**ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md index e0225d8dd49..ae75c592540 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md index 3f11685aced..7fcd31a3a5e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema > Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md index 74232c3ced9..e1510991195 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**ShapeType** | **string** | | **TriangleType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs index de2b162ad3a..b38f735ae16 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -148,8 +148,6 @@ namespace Org.OpenAPITools.Client return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); - if (obj is Mammal.TypeEnum mammalTypeEnum) - return Mammal.TypeEnumToJsonValue(mammalTypeEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); if (obj is Order.StatusEnum orderStatusEnum) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs index ad791fef1b3..c8d4ddf9d57 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs @@ -34,17 +34,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Apple? apple, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Apple? apple, string color) { Apple = apple; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -53,17 +47,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Banana? banana, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Banana? banana, string color) { Banana = banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -80,24 +68,6 @@ namespace Org.OpenAPITools.Model /// public Banana? Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -113,9 +83,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Fruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -127,20 +94,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -167,9 +120,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? cultivar = default; - decimal? lengthCm = default; - string? origin = default; string? color = default; while (utf8JsonReader.Read()) @@ -187,16 +137,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -206,25 +146,16 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class Fruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Fruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class Fruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); Utf8JsonReader appleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReader, jsonSerializerOptions, out Apple? apple)) - return new Fruit(apple, cultivar, lengthCm.Value, origin, color); + return new Fruit(apple, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana)) - return new Fruit(banana, cultivar, lengthCm.Value, origin, color); + return new Fruit(banana, color); throw new JsonException(); } @@ -244,9 +175,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruit.Cultivar); - writer.WriteNumber("lengthCm", fruit.LengthCm); - writer.WriteString("origin", fruit.Origin); writer.WriteString("color", fruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs index 1d6bb123537..f751c01fe90 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs @@ -34,18 +34,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(AppleReq? appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(AppleReq? appleReq) { AppleReq = appleReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -53,18 +45,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(BananaReq? bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(BananaReq? bananaReq) { BananaReq = bananaReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -80,30 +64,6 @@ namespace Org.OpenAPITools.Model /// public BananaReq? BananaReq { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Mealy - /// - [JsonPropertyName("mealy")] - public bool Mealy { get; set; } - - /// - /// Gets or Sets Sweet - /// - [JsonPropertyName("sweet")] - public bool Sweet { get; set; } - /// /// Returns the string presentation of the object /// @@ -112,10 +72,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class FruitReq {\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Mealy: ").Append(Mealy).Append("\n"); - sb.Append(" Sweet: ").Append(Sweet).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -153,11 +109,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? cultivar = default; - decimal? lengthCm = default; - bool? mealy = default; - bool? sweet = default; - while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -173,46 +124,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "mealy": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - mealy = utf8JsonReader.GetBoolean(); - break; - case "sweet": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - sweet = utf8JsonReader.GetBoolean(); - break; default: break; } } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class FruitReq."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class FruitReq."); - - if (mealy == null) - throw new ArgumentNullException(nameof(mealy), "Property is required for class FruitReq."); - - if (sweet == null) - throw new ArgumentNullException(nameof(sweet), "Property is required for class FruitReq."); - Utf8JsonReader appleReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReqReader, jsonSerializerOptions, out AppleReq? appleReq)) - return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(appleReq); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq? bananaReq)) - return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(bananaReq); throw new JsonException(); } @@ -232,11 +156,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruitReq.Cultivar); - writer.WriteNumber("lengthCm", fruitReq.LengthCm); - writer.WriteBoolean("mealy", fruitReq.Mealy); - writer.WriteBoolean("sweet", fruitReq.Sweet); - writer.WriteEndObject(); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs index feb9c389fec..2da4cb6c8a8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs @@ -35,18 +35,12 @@ namespace Org.OpenAPITools.Model /// /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public GmFruit(Apple? apple, Banana? banana, string cultivar, decimal lengthCm, string origin, string color) + public GmFruit(Apple? apple, Banana? banana, string color) { Apple = Apple; Banana = Banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -63,24 +57,6 @@ namespace Org.OpenAPITools.Model /// public Banana? Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -96,9 +72,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class GmFruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -110,20 +83,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -156,9 +115,6 @@ namespace Org.OpenAPITools.Model Utf8JsonReader bananaReader = utf8JsonReader; bool bananaDeserialized = Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana); - string? cultivar = default; - decimal? lengthCm = default; - string? origin = default; string? color = default; while (utf8JsonReader.Read()) @@ -176,16 +132,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -195,19 +141,10 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class GmFruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class GmFruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class GmFruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); - return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); + return new GmFruit(apple, banana, color); } /// @@ -225,9 +162,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", gmFruit.Cultivar); - writer.WriteNumber("lengthCm", gmFruit.LengthCm); - writer.WriteString("origin", gmFruit.Origin); writer.WriteString("color", gmFruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs index d5425246bc3..d87e7d6f384 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs @@ -35,17 +35,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Whale? whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Whale? whale, string className) { Whale = whale; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -54,17 +48,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Zebra? zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Zebra? zebra, string className) { Zebra = zebra; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -73,108 +61,16 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Pig? pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Pig? pig, string className) { Pig = pig; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } partial void OnCreated(); - /// - /// Defines Type - /// - public enum TypeEnum - { - /// - /// Enum Plains for value: plains - /// - Plains = 1, - - /// - /// Enum Mountain for value: mountain - /// - Mountain = 2, - - /// - /// Enum Grevys for value: grevys - /// - Grevys = 3 - } - - /// - /// Returns a - /// - /// - /// - /// - public static TypeEnum TypeEnumFromString(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - throw new NotImplementedException($"Could not convert value to type TypeEnum: '{value}'"); - } - - /// - /// Returns a - /// - /// - /// - public static TypeEnum? TypeEnumFromStringOrDefault(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string TypeEnumToJsonValue(TypeEnum value) - { - if (value == TypeEnum.Plains) - return "plains"; - - if (value == TypeEnum.Mountain) - return "mountain"; - - if (value == TypeEnum.Grevys) - return "grevys"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - - /// - /// Gets or Sets Type - /// - [JsonPropertyName("type")] - public TypeEnum Type { get; set; } - /// /// Gets or Sets Whale /// @@ -196,18 +92,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("className")] public string ClassName { get; set; } - /// - /// Gets or Sets HasBaleen - /// - [JsonPropertyName("hasBaleen")] - public bool HasBaleen { get; set; } - - /// - /// Gets or Sets HasTeeth - /// - [JsonPropertyName("hasTeeth")] - public bool HasTeeth { get; set; } - /// /// Gets or Sets additional properties /// @@ -223,9 +107,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Mammal {\n"); sb.Append(" ClassName: ").Append(ClassName).Append("\n"); - sb.Append(" HasBaleen: ").Append(HasBaleen).Append("\n"); - sb.Append(" HasTeeth: ").Append(HasTeeth).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -275,9 +156,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string? className = default; - bool? hasBaleen = default; - bool? hasTeeth = default; - Mammal.TypeEnum? type = default; while (utf8JsonReader.Read()) { @@ -297,20 +175,6 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; - case "hasBaleen": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasBaleen = utf8JsonReader.GetBoolean(); - break; - case "hasTeeth": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasTeeth = utf8JsonReader.GetBoolean(); - break; - case "type": - string? typeRawValue = utf8JsonReader.GetString(); - type = typeRawValue == null - ? null - : Mammal.TypeEnumFromStringOrDefault(typeRawValue); - break; default: break; } @@ -320,26 +184,17 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Mammal."); - if (hasBaleen == null) - throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Mammal."); - - if (hasTeeth == null) - throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Mammal."); - - if (type == null) - throw new ArgumentNullException(nameof(type), "Property is required for class Mammal."); - Utf8JsonReader whaleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref whaleReader, jsonSerializerOptions, out Whale? whale)) - return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(whale, className); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra? zebra)) - return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(zebra, className); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig? pig)) - return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(pig, className); throw new JsonException(); } @@ -362,14 +217,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", mammal.ClassName); - writer.WriteBoolean("hasBaleen", mammal.HasBaleen); - writer.WriteBoolean("hasTeeth", mammal.HasTeeth); - - var typeRawValue = Mammal.TypeEnumToJsonValue(mammal.Type); - if (typeRawValue != null) - writer.WriteString("type", typeRawValue); - else - writer.WriteNull("type"); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs index 0928ad4709e..c7d07581f7a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs @@ -34,16 +34,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Triangle? triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -51,16 +47,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Quadrilateral? quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -76,24 +68,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral? Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -108,7 +88,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class NullableShape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -158,9 +137,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? quadrilateralType = default; string? shapeType = default; - string? triangleType = default; while (utf8JsonReader.Read()) { @@ -177,37 +154,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class NullableShape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class NullableShape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class NullableShape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle? triangle)) - return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); + return new NullableShape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new NullableShape(quadrilateral, shapeType); throw new JsonException(); } @@ -227,9 +192,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", nullableShape.QuadrilateralType); writer.WriteString("shapeType", nullableShape.ShapeType); - writer.WriteString("triangleType", nullableShape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs index 4b0d3dc86e7..f1fe4c0417e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -35,13 +35,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(SimpleQuadrilateral? simpleQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(SimpleQuadrilateral? simpleQuadrilateral, string quadrilateralType) { SimpleQuadrilateral = simpleQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -50,13 +48,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(ComplexQuadrilateral? complexQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(ComplexQuadrilateral? complexQuadrilateral, string quadrilateralType) { ComplexQuadrilateral = complexQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -78,12 +74,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("quadrilateralType")] public string QuadrilateralType { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets additional properties /// @@ -99,7 +89,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Quadrilateral {\n"); sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -149,7 +138,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string? quadrilateralType = default; - string? shapeType = default; while (utf8JsonReader.Read()) { @@ -169,9 +157,6 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; default: break; } @@ -181,16 +166,13 @@ namespace Org.OpenAPITools.Model if (quadrilateralType == null) throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Quadrilateral."); - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Quadrilateral."); - Utf8JsonReader simpleQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref simpleQuadrilateralReader, jsonSerializerOptions, out SimpleQuadrilateral? simpleQuadrilateral)) - return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral? complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(complexQuadrilateral, quadrilateralType); throw new JsonException(); } @@ -211,7 +193,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); - writer.WriteString("shapeType", quadrilateral.ShapeType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index a774449cdbb..73e2e16c826 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -34,16 +34,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) + public Shape(Triangle? triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -51,16 +47,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public Shape(Quadrilateral? quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -76,24 +68,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral? Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -108,7 +88,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Shape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -158,9 +137,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? quadrilateralType = default; string? shapeType = default; - string? triangleType = default; while (utf8JsonReader.Read()) { @@ -177,37 +154,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class Shape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class Shape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle? triangle)) - return new Shape(triangle, quadrilateralType, shapeType, triangleType); + return new Shape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new Shape(quadrilateral, shapeType); throw new JsonException(); } @@ -227,9 +192,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shape.QuadrilateralType); writer.WriteString("shapeType", shape.ShapeType); - writer.WriteString("triangleType", shape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index d1fcd0ed701..b6dda2c5f71 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -34,16 +34,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Triangle? triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -51,16 +47,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Quadrilateral? quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -76,24 +68,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral? Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -108,7 +88,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ShapeOrNull {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -158,9 +137,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? quadrilateralType = default; string? shapeType = default; - string? triangleType = default; while (utf8JsonReader.Read()) { @@ -177,37 +154,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeOrNull."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class ShapeOrNull."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle? triangle)) - return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(quadrilateral, shapeType); throw new JsonException(); } @@ -227,9 +192,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shapeOrNull.QuadrilateralType); writer.WriteString("shapeType", shapeOrNull.ShapeType); - writer.WriteString("triangleType", shapeOrNull.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs index 26b9f070674..75c45f2ec3e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs @@ -34,13 +34,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(EquilateralTriangle? equilateralTriangle, string shapeType, string triangleType) + public Triangle(EquilateralTriangle? equilateralTriangle, string triangleType) { EquilateralTriangle = equilateralTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -49,13 +47,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(IsoscelesTriangle? isoscelesTriangle, string shapeType, string triangleType) + public Triangle(IsoscelesTriangle? isoscelesTriangle, string triangleType) { IsoscelesTriangle = isoscelesTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -64,13 +60,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(ScaleneTriangle? scaleneTriangle, string shapeType, string triangleType) + public Triangle(ScaleneTriangle? scaleneTriangle, string triangleType) { ScaleneTriangle = scaleneTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -92,12 +86,6 @@ namespace Org.OpenAPITools.Model /// public ScaleneTriangle? ScaleneTriangle { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets TriangleType /// @@ -118,7 +106,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Triangle {\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -168,7 +155,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string? shapeType = default; string? triangleType = default; while (utf8JsonReader.Read()) @@ -186,9 +172,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; case "triangleType": triangleType = utf8JsonReader.GetString(); break; @@ -198,23 +181,20 @@ namespace Org.OpenAPITools.Model } } - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); - if (triangleType == null) throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); Utf8JsonReader equilateralTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref equilateralTriangleReader, jsonSerializerOptions, out EquilateralTriangle? equilateralTriangle)) - return new Triangle(equilateralTriangle, shapeType, triangleType); + return new Triangle(equilateralTriangle, triangleType); Utf8JsonReader isoscelesTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref isoscelesTriangleReader, jsonSerializerOptions, out IsoscelesTriangle? isoscelesTriangle)) - return new Triangle(isoscelesTriangle, shapeType, triangleType); + return new Triangle(isoscelesTriangle, triangleType); Utf8JsonReader scaleneTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref scaleneTriangleReader, jsonSerializerOptions, out ScaleneTriangle? scaleneTriangle)) - return new Triangle(scaleneTriangle, shapeType, triangleType); + return new Triangle(scaleneTriangle, triangleType); throw new JsonException(); } @@ -236,7 +216,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("shapeType", triangle.ShapeType); writer.WriteString("triangleType", triangle.TriangleType); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md index 1a298dac767..b3bee18f7ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md index 5217febc9b6..38ab0c1a6ca 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md @@ -4,10 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Cultivar** | **string** | | -**LengthCm** | **decimal** | | -**Mealy** | **bool** | | [optional] -**Sweet** | **bool** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md index 49b24074b79..584c4fd323d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md index 82a8ca6027b..ac14f00c0ff 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | -**HasBaleen** | **bool** | | [optional] -**HasTeeth** | **bool** | | [optional] -**Type** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md index 948b6d047ce..2720167ccaa 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md index d1c44507419..fbbf4f81cec 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **QuadrilateralType** | **string** | | -**ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md index e0225d8dd49..ae75c592540 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md index 3f11685aced..7fcd31a3a5e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema > Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md index 74232c3ced9..e1510991195 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**ShapeType** | **string** | | **TriangleType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs index ae3183e9e73..7769e9200eb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -146,8 +146,6 @@ namespace Org.OpenAPITools.Client return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); - if (obj is Mammal.TypeEnum mammalTypeEnum) - return Mammal.TypeEnumToJsonValue(mammalTypeEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); if (obj is Order.StatusEnum orderStatusEnum) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs index d200c36dc8d..743cb17f2ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -32,17 +32,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Apple apple, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Apple apple, string color) { Apple = apple; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -51,17 +45,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Banana banana, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Banana banana, string color) { Banana = banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -78,24 +66,6 @@ namespace Org.OpenAPITools.Model /// public Banana Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -111,9 +81,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Fruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -125,20 +92,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -165,9 +118,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string cultivar = default; - decimal? lengthCm = default; - string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -185,16 +135,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -204,25 +144,16 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class Fruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Fruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class Fruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); Utf8JsonReader appleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReader, jsonSerializerOptions, out Apple apple)) - return new Fruit(apple, cultivar, lengthCm.Value, origin, color); + return new Fruit(apple, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana)) - return new Fruit(banana, cultivar, lengthCm.Value, origin, color); + return new Fruit(banana, color); throw new JsonException(); } @@ -242,9 +173,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruit.Cultivar); - writer.WriteNumber("lengthCm", fruit.LengthCm); - writer.WriteString("origin", fruit.Origin); writer.WriteString("color", fruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs index 7a60bbba353..ae6cc210e6e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -32,18 +32,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(AppleReq appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(AppleReq appleReq) { AppleReq = appleReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -51,18 +43,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(BananaReq bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(BananaReq bananaReq) { BananaReq = bananaReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -78,30 +62,6 @@ namespace Org.OpenAPITools.Model /// public BananaReq BananaReq { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Mealy - /// - [JsonPropertyName("mealy")] - public bool Mealy { get; set; } - - /// - /// Gets or Sets Sweet - /// - [JsonPropertyName("sweet")] - public bool Sweet { get; set; } - /// /// Returns the string presentation of the object /// @@ -110,10 +70,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class FruitReq {\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Mealy: ").Append(Mealy).Append("\n"); - sb.Append(" Sweet: ").Append(Sweet).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -151,11 +107,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string cultivar = default; - decimal? lengthCm = default; - bool? mealy = default; - bool? sweet = default; - while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -171,46 +122,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "mealy": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - mealy = utf8JsonReader.GetBoolean(); - break; - case "sweet": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - sweet = utf8JsonReader.GetBoolean(); - break; default: break; } } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class FruitReq."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class FruitReq."); - - if (mealy == null) - throw new ArgumentNullException(nameof(mealy), "Property is required for class FruitReq."); - - if (sweet == null) - throw new ArgumentNullException(nameof(sweet), "Property is required for class FruitReq."); - Utf8JsonReader appleReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReqReader, jsonSerializerOptions, out AppleReq appleReq)) - return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(appleReq); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq bananaReq)) - return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(bananaReq); throw new JsonException(); } @@ -230,11 +154,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruitReq.Cultivar); - writer.WriteNumber("lengthCm", fruitReq.LengthCm); - writer.WriteBoolean("mealy", fruitReq.Mealy); - writer.WriteBoolean("sweet", fruitReq.Sweet); - writer.WriteEndObject(); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs index 24e2c54d76b..e751dee0b7e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -33,18 +33,12 @@ namespace Org.OpenAPITools.Model /// /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public GmFruit(Apple apple, Banana banana, string cultivar, decimal lengthCm, string origin, string color) + public GmFruit(Apple apple, Banana banana, string color) { Apple = Apple; Banana = Banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -61,24 +55,6 @@ namespace Org.OpenAPITools.Model /// public Banana Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -94,9 +70,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class GmFruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -108,20 +81,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -154,9 +113,6 @@ namespace Org.OpenAPITools.Model Utf8JsonReader bananaReader = utf8JsonReader; bool bananaDeserialized = Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana); - string cultivar = default; - decimal? lengthCm = default; - string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -174,16 +130,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -193,19 +139,10 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class GmFruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class GmFruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class GmFruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); - return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); + return new GmFruit(apple, banana, color); } /// @@ -223,9 +160,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", gmFruit.Cultivar); - writer.WriteNumber("lengthCm", gmFruit.LengthCm); - writer.WriteString("origin", gmFruit.Origin); writer.WriteString("color", gmFruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs index ba88dea6be9..c502b70a36b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -33,17 +33,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Whale whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Whale whale, string className) { Whale = whale; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -52,17 +46,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Zebra zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Zebra zebra, string className) { Zebra = zebra; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -71,108 +59,16 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Pig pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Pig pig, string className) { Pig = pig; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } partial void OnCreated(); - /// - /// Defines Type - /// - public enum TypeEnum - { - /// - /// Enum Plains for value: plains - /// - Plains = 1, - - /// - /// Enum Mountain for value: mountain - /// - Mountain = 2, - - /// - /// Enum Grevys for value: grevys - /// - Grevys = 3 - } - - /// - /// Returns a - /// - /// - /// - /// - public static TypeEnum TypeEnumFromString(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - throw new NotImplementedException($"Could not convert value to type TypeEnum: '{value}'"); - } - - /// - /// Returns a - /// - /// - /// - public static TypeEnum? TypeEnumFromStringOrDefault(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string TypeEnumToJsonValue(TypeEnum value) - { - if (value == TypeEnum.Plains) - return "plains"; - - if (value == TypeEnum.Mountain) - return "mountain"; - - if (value == TypeEnum.Grevys) - return "grevys"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - - /// - /// Gets or Sets Type - /// - [JsonPropertyName("type")] - public TypeEnum Type { get; set; } - /// /// Gets or Sets Whale /// @@ -194,18 +90,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("className")] public string ClassName { get; set; } - /// - /// Gets or Sets HasBaleen - /// - [JsonPropertyName("hasBaleen")] - public bool HasBaleen { get; set; } - - /// - /// Gets or Sets HasTeeth - /// - [JsonPropertyName("hasTeeth")] - public bool HasTeeth { get; set; } - /// /// Gets or Sets additional properties /// @@ -221,9 +105,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Mammal {\n"); sb.Append(" ClassName: ").Append(ClassName).Append("\n"); - sb.Append(" HasBaleen: ").Append(HasBaleen).Append("\n"); - sb.Append(" HasTeeth: ").Append(HasTeeth).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -273,9 +154,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string className = default; - bool? hasBaleen = default; - bool? hasTeeth = default; - Mammal.TypeEnum? type = default; while (utf8JsonReader.Read()) { @@ -295,20 +173,6 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; - case "hasBaleen": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasBaleen = utf8JsonReader.GetBoolean(); - break; - case "hasTeeth": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasTeeth = utf8JsonReader.GetBoolean(); - break; - case "type": - string typeRawValue = utf8JsonReader.GetString(); - type = typeRawValue == null - ? null - : Mammal.TypeEnumFromStringOrDefault(typeRawValue); - break; default: break; } @@ -318,26 +182,17 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Mammal."); - if (hasBaleen == null) - throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Mammal."); - - if (hasTeeth == null) - throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Mammal."); - - if (type == null) - throw new ArgumentNullException(nameof(type), "Property is required for class Mammal."); - Utf8JsonReader whaleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref whaleReader, jsonSerializerOptions, out Whale whale)) - return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(whale, className); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra zebra)) - return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(zebra, className); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig pig)) - return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(pig, className); throw new JsonException(); } @@ -360,14 +215,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", mammal.ClassName); - writer.WriteBoolean("hasBaleen", mammal.HasBaleen); - writer.WriteBoolean("hasTeeth", mammal.HasTeeth); - - var typeRawValue = Mammal.TypeEnumToJsonValue(mammal.Type); - if (typeRawValue != null) - writer.WriteString("type", typeRawValue); - else - writer.WriteNull("type"); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs index 31f6a6b909f..ea6ff8db1f7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class NullableShape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class NullableShape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class NullableShape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class NullableShape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); + return new NullableShape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new NullableShape(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", nullableShape.QuadrilateralType); writer.WriteString("shapeType", nullableShape.ShapeType); - writer.WriteString("triangleType", nullableShape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index e6827767a2f..f8d8807479d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -33,13 +33,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType) { SimpleQuadrilateral = simpleQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -48,13 +46,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType) { ComplexQuadrilateral = complexQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -76,12 +72,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("quadrilateralType")] public string QuadrilateralType { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets additional properties /// @@ -97,7 +87,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Quadrilateral {\n"); sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -147,7 +136,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; - string shapeType = default; while (utf8JsonReader.Read()) { @@ -167,9 +155,6 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; default: break; } @@ -179,16 +164,13 @@ namespace Org.OpenAPITools.Model if (quadrilateralType == null) throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Quadrilateral."); - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Quadrilateral."); - Utf8JsonReader simpleQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref simpleQuadrilateralReader, jsonSerializerOptions, out SimpleQuadrilateral simpleQuadrilateral)) - return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(complexQuadrilateral, quadrilateralType); throw new JsonException(); } @@ -209,7 +191,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); - writer.WriteString("shapeType", quadrilateral.ShapeType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs index 0183c25f725..832dafee68c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public Shape(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public Shape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Shape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class Shape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class Shape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new Shape(triangle, quadrilateralType, shapeType, triangleType); + return new Shape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new Shape(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shape.QuadrilateralType); writer.WriteString("shapeType", shape.ShapeType); - writer.WriteString("triangleType", shape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 478f16265d7..dbd6455b7ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ShapeOrNull {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeOrNull."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class ShapeOrNull."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shapeOrNull.QuadrilateralType); writer.WriteString("shapeType", shapeOrNull.ShapeType); - writer.WriteString("triangleType", shapeOrNull.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs index 97cacac540f..c66f2e216c4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -32,13 +32,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) + public Triangle(EquilateralTriangle equilateralTriangle, string triangleType) { EquilateralTriangle = equilateralTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -47,13 +45,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) + public Triangle(IsoscelesTriangle isoscelesTriangle, string triangleType) { IsoscelesTriangle = isoscelesTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -62,13 +58,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) + public Triangle(ScaleneTriangle scaleneTriangle, string triangleType) { ScaleneTriangle = scaleneTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -90,12 +84,6 @@ namespace Org.OpenAPITools.Model /// public ScaleneTriangle ScaleneTriangle { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets TriangleType /// @@ -116,7 +104,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Triangle {\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -166,7 +153,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string shapeType = default; string triangleType = default; while (utf8JsonReader.Read()) @@ -184,9 +170,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; case "triangleType": triangleType = utf8JsonReader.GetString(); break; @@ -196,23 +179,20 @@ namespace Org.OpenAPITools.Model } } - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); - if (triangleType == null) throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); Utf8JsonReader equilateralTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref equilateralTriangleReader, jsonSerializerOptions, out EquilateralTriangle equilateralTriangle)) - return new Triangle(equilateralTriangle, shapeType, triangleType); + return new Triangle(equilateralTriangle, triangleType); Utf8JsonReader isoscelesTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref isoscelesTriangleReader, jsonSerializerOptions, out IsoscelesTriangle isoscelesTriangle)) - return new Triangle(isoscelesTriangle, shapeType, triangleType); + return new Triangle(isoscelesTriangle, triangleType); Utf8JsonReader scaleneTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref scaleneTriangleReader, jsonSerializerOptions, out ScaleneTriangle scaleneTriangle)) - return new Triangle(scaleneTriangle, shapeType, triangleType); + return new Triangle(scaleneTriangle, triangleType); throw new JsonException(); } @@ -234,7 +214,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("shapeType", triangle.ShapeType); writer.WriteString("triangleType", triangle.TriangleType); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md index 9d9df53f4a1..b3bee18f7ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md @@ -5,8 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Count** | **decimal** | | [optional] -**Kind** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs index 75d88f0a19f..0924fb30fcd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -35,16 +35,12 @@ namespace Org.OpenAPITools.Model /// /// /// - /// count - /// kind /// color [JsonConstructor] - public Fruit(Apple? apple, Banana? banana, decimal count, string kind, string color) + public Fruit(Apple? apple, Banana? banana, string color) { Apple = Apple; Banana = Banana; - Count = count; - Kind = kind; Color = color; OnCreated(); } @@ -61,18 +57,6 @@ namespace Org.OpenAPITools.Model /// public Banana? Banana { get; set; } - /// - /// Gets or Sets Count - /// - [JsonPropertyName("count")] - public decimal Count { get; set; } - - /// - /// Gets or Sets Kind - /// - [JsonPropertyName("kind")] - public string Kind { get; set; } - /// /// Gets or Sets Color /// @@ -94,8 +78,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Fruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Count: ").Append(Count).Append("\n"); - sb.Append(" Kind: ").Append(Kind).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -140,8 +122,6 @@ namespace Org.OpenAPITools.Model Utf8JsonReader bananaReader = utf8JsonReader; bool bananaDeserialized = Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana); - decimal? count = default; - string? kind = default; string? color = default; while (utf8JsonReader.Read()) @@ -159,13 +139,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "count": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - count = utf8JsonReader.GetDecimal(); - break; - case "kind": - kind = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -175,16 +148,10 @@ namespace Org.OpenAPITools.Model } } - if (count == null) - throw new ArgumentNullException(nameof(count), "Property is required for class Fruit."); - - if (kind == null) - throw new ArgumentNullException(nameof(kind), "Property is required for class Fruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); - return new Fruit(apple, banana, count.Value, kind, color); + return new Fruit(apple, banana, color); } /// @@ -202,8 +169,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteNumber("count", fruit.Count); - writer.WriteString("kind", fruit.Kind); writer.WriteString("color", fruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md index 9d9df53f4a1..b3bee18f7ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md @@ -5,8 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Count** | **decimal** | | [optional] -**Kind** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs index 78eea425673..5abaf8b01ac 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -34,15 +34,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// count - /// kind /// color [JsonConstructor] - public Fruit(Apple? apple, decimal count, string kind, string color) + public Fruit(Apple? apple, string color) { Apple = apple; - Count = count; - Kind = kind; Color = color; OnCreated(); } @@ -51,15 +47,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// count - /// kind /// color [JsonConstructor] - public Fruit(Banana? banana, decimal count, string kind, string color) + public Fruit(Banana? banana, string color) { Banana = banana; - Count = count; - Kind = kind; Color = color; OnCreated(); } @@ -76,18 +68,6 @@ namespace Org.OpenAPITools.Model /// public Banana? Banana { get; set; } - /// - /// Gets or Sets Count - /// - [JsonPropertyName("count")] - public decimal Count { get; set; } - - /// - /// Gets or Sets Kind - /// - [JsonPropertyName("kind")] - public string Kind { get; set; } - /// /// Gets or Sets Color /// @@ -109,8 +89,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Fruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Count: ").Append(Count).Append("\n"); - sb.Append(" Kind: ").Append(Kind).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -149,8 +127,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - decimal? count = default; - string? kind = default; string? color = default; while (utf8JsonReader.Read()) @@ -168,13 +144,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "count": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - count = utf8JsonReader.GetDecimal(); - break; - case "kind": - kind = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -184,22 +153,16 @@ namespace Org.OpenAPITools.Model } } - if (count == null) - throw new ArgumentNullException(nameof(count), "Property is required for class Fruit."); - - if (kind == null) - throw new ArgumentNullException(nameof(kind), "Property is required for class Fruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); Utf8JsonReader appleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReader, jsonSerializerOptions, out Apple? apple)) - return new Fruit(apple, count.Value, kind, color); + return new Fruit(apple, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana)) - return new Fruit(banana, count.Value, kind, color); + return new Fruit(banana, color); throw new JsonException(); } @@ -219,8 +182,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteNumber("count", fruit.Count); - writer.WriteString("kind", fruit.Kind); writer.WriteString("color", fruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md index 1a298dac767..b3bee18f7ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md index 5217febc9b6..38ab0c1a6ca 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md @@ -4,10 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Cultivar** | **string** | | -**LengthCm** | **decimal** | | -**Mealy** | **bool** | | [optional] -**Sweet** | **bool** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md index 49b24074b79..584c4fd323d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Color** | **string** | | [optional] -**Cultivar** | **string** | | [optional] -**LengthCm** | **decimal** | | [optional] -**Origin** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md index 82a8ca6027b..ac14f00c0ff 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md @@ -5,9 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | -**HasBaleen** | **bool** | | [optional] -**HasTeeth** | **bool** | | [optional] -**Type** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md index 948b6d047ce..2720167ccaa 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. The 'nullable' attribute was intro Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md index d1c44507419..fbbf4f81cec 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **QuadrilateralType** | **string** | | -**ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md index e0225d8dd49..ae75c592540 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md index 3f11685aced..7fcd31a3a5e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md @@ -5,7 +5,6 @@ The value may be a shape or the 'null' value. This is introduced in OAS schema > Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**QuadrilateralType** | **string** | | **ShapeType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md index 74232c3ced9..e1510991195 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md @@ -4,7 +4,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**ShapeType** | **string** | | **TriangleType** | **string** | | [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 21d629b7106..c5906786632 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -146,8 +146,6 @@ namespace Org.OpenAPITools.Client return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); - if (obj is Mammal.TypeEnum mammalTypeEnum) - return Mammal.TypeEnumToJsonValue(mammalTypeEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); if (obj is Order.StatusEnum orderStatusEnum) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs index d200c36dc8d..743cb17f2ba 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -32,17 +32,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Apple apple, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Apple apple, string color) { Apple = apple; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -51,17 +45,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public Fruit(Banana banana, string cultivar, decimal lengthCm, string origin, string color) + public Fruit(Banana banana, string color) { Banana = banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -78,24 +66,6 @@ namespace Org.OpenAPITools.Model /// public Banana Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -111,9 +81,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Fruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -125,20 +92,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -165,9 +118,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string cultivar = default; - decimal? lengthCm = default; - string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -185,16 +135,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -204,25 +144,16 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class Fruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Fruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class Fruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); Utf8JsonReader appleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReader, jsonSerializerOptions, out Apple apple)) - return new Fruit(apple, cultivar, lengthCm.Value, origin, color); + return new Fruit(apple, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana)) - return new Fruit(banana, cultivar, lengthCm.Value, origin, color); + return new Fruit(banana, color); throw new JsonException(); } @@ -242,9 +173,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruit.Cultivar); - writer.WriteNumber("lengthCm", fruit.LengthCm); - writer.WriteString("origin", fruit.Origin); writer.WriteString("color", fruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs index 7a60bbba353..ae6cc210e6e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -32,18 +32,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(AppleReq appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(AppleReq appleReq) { AppleReq = appleReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -51,18 +43,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// cultivar - /// lengthCm - /// mealy - /// sweet [JsonConstructor] - public FruitReq(BananaReq bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) + internal FruitReq(BananaReq bananaReq) { BananaReq = bananaReq; - Cultivar = cultivar; - LengthCm = lengthCm; - Mealy = mealy; - Sweet = sweet; OnCreated(); } @@ -78,30 +62,6 @@ namespace Org.OpenAPITools.Model /// public BananaReq BananaReq { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Mealy - /// - [JsonPropertyName("mealy")] - public bool Mealy { get; set; } - - /// - /// Gets or Sets Sweet - /// - [JsonPropertyName("sweet")] - public bool Sweet { get; set; } - /// /// Returns the string presentation of the object /// @@ -110,10 +70,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class FruitReq {\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Mealy: ").Append(Mealy).Append("\n"); - sb.Append(" Sweet: ").Append(Sweet).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -151,11 +107,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string cultivar = default; - decimal? lengthCm = default; - bool? mealy = default; - bool? sweet = default; - while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -171,46 +122,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "mealy": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - mealy = utf8JsonReader.GetBoolean(); - break; - case "sweet": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - sweet = utf8JsonReader.GetBoolean(); - break; default: break; } } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class FruitReq."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class FruitReq."); - - if (mealy == null) - throw new ArgumentNullException(nameof(mealy), "Property is required for class FruitReq."); - - if (sweet == null) - throw new ArgumentNullException(nameof(sweet), "Property is required for class FruitReq."); - Utf8JsonReader appleReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref appleReqReader, jsonSerializerOptions, out AppleReq appleReq)) - return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(appleReq); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq bananaReq)) - return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); + return new FruitReq(bananaReq); throw new JsonException(); } @@ -230,11 +154,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", fruitReq.Cultivar); - writer.WriteNumber("lengthCm", fruitReq.LengthCm); - writer.WriteBoolean("mealy", fruitReq.Mealy); - writer.WriteBoolean("sweet", fruitReq.Sweet); - writer.WriteEndObject(); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs index 24e2c54d76b..e751dee0b7e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -33,18 +33,12 @@ namespace Org.OpenAPITools.Model /// /// /// - /// cultivar - /// lengthCm - /// origin /// color [JsonConstructor] - public GmFruit(Apple apple, Banana banana, string cultivar, decimal lengthCm, string origin, string color) + public GmFruit(Apple apple, Banana banana, string color) { Apple = Apple; Banana = Banana; - Cultivar = cultivar; - LengthCm = lengthCm; - Origin = origin; Color = color; OnCreated(); } @@ -61,24 +55,6 @@ namespace Org.OpenAPITools.Model /// public Banana Banana { get; set; } - /// - /// Gets or Sets Cultivar - /// - [JsonPropertyName("cultivar")] - public string Cultivar { get; set; } - - /// - /// Gets or Sets LengthCm - /// - [JsonPropertyName("lengthCm")] - public decimal LengthCm { get; set; } - - /// - /// Gets or Sets Origin - /// - [JsonPropertyName("origin")] - public string Origin { get; set; } - /// /// Gets or Sets Color /// @@ -94,9 +70,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class GmFruit {\n"); sb.Append(" Color: ").Append(Color).Append("\n"); - sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); - sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); - sb.Append(" Origin: ").Append(Origin).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -108,20 +81,6 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\s]*$", RegexOptions.CultureInvariant); - if (false == regexCultivar.Match(this.Cultivar).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); - } - - // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (false == regexOrigin.Match(this.Origin).Success) - { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); - } - yield break; } } @@ -154,9 +113,6 @@ namespace Org.OpenAPITools.Model Utf8JsonReader bananaReader = utf8JsonReader; bool bananaDeserialized = Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana); - string cultivar = default; - decimal? lengthCm = default; - string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -174,16 +130,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "cultivar": - cultivar = utf8JsonReader.GetString(); - break; - case "lengthCm": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - lengthCm = utf8JsonReader.GetDecimal(); - break; - case "origin": - origin = utf8JsonReader.GetString(); - break; case "color": color = utf8JsonReader.GetString(); break; @@ -193,19 +139,10 @@ namespace Org.OpenAPITools.Model } } - if (cultivar == null) - throw new ArgumentNullException(nameof(cultivar), "Property is required for class GmFruit."); - - if (lengthCm == null) - throw new ArgumentNullException(nameof(lengthCm), "Property is required for class GmFruit."); - - if (origin == null) - throw new ArgumentNullException(nameof(origin), "Property is required for class GmFruit."); - if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); - return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); + return new GmFruit(apple, banana, color); } /// @@ -223,9 +160,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("cultivar", gmFruit.Cultivar); - writer.WriteNumber("lengthCm", gmFruit.LengthCm); - writer.WriteString("origin", gmFruit.Origin); writer.WriteString("color", gmFruit.Color); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs index ba88dea6be9..c502b70a36b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -33,17 +33,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Whale whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Whale whale, string className) { Whale = whale; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -52,17 +46,11 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Zebra zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Zebra zebra, string className) { Zebra = zebra; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } @@ -71,108 +59,16 @@ namespace Org.OpenAPITools.Model /// /// /// className - /// hasBaleen - /// hasTeeth - /// type [JsonConstructor] - public Mammal(Pig pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) + public Mammal(Pig pig, string className) { Pig = pig; ClassName = className; - HasBaleen = hasBaleen; - HasTeeth = hasTeeth; - Type = type; OnCreated(); } partial void OnCreated(); - /// - /// Defines Type - /// - public enum TypeEnum - { - /// - /// Enum Plains for value: plains - /// - Plains = 1, - - /// - /// Enum Mountain for value: mountain - /// - Mountain = 2, - - /// - /// Enum Grevys for value: grevys - /// - Grevys = 3 - } - - /// - /// Returns a - /// - /// - /// - /// - public static TypeEnum TypeEnumFromString(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - throw new NotImplementedException($"Could not convert value to type TypeEnum: '{value}'"); - } - - /// - /// Returns a - /// - /// - /// - public static TypeEnum? TypeEnumFromStringOrDefault(string value) - { - if (value == "plains") - return TypeEnum.Plains; - - if (value == "mountain") - return TypeEnum.Mountain; - - if (value == "grevys") - return TypeEnum.Grevys; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string TypeEnumToJsonValue(TypeEnum value) - { - if (value == TypeEnum.Plains) - return "plains"; - - if (value == TypeEnum.Mountain) - return "mountain"; - - if (value == TypeEnum.Grevys) - return "grevys"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - - /// - /// Gets or Sets Type - /// - [JsonPropertyName("type")] - public TypeEnum Type { get; set; } - /// /// Gets or Sets Whale /// @@ -194,18 +90,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("className")] public string ClassName { get; set; } - /// - /// Gets or Sets HasBaleen - /// - [JsonPropertyName("hasBaleen")] - public bool HasBaleen { get; set; } - - /// - /// Gets or Sets HasTeeth - /// - [JsonPropertyName("hasTeeth")] - public bool HasTeeth { get; set; } - /// /// Gets or Sets additional properties /// @@ -221,9 +105,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Mammal {\n"); sb.Append(" ClassName: ").Append(ClassName).Append("\n"); - sb.Append(" HasBaleen: ").Append(HasBaleen).Append("\n"); - sb.Append(" HasTeeth: ").Append(HasTeeth).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -273,9 +154,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string className = default; - bool? hasBaleen = default; - bool? hasTeeth = default; - Mammal.TypeEnum? type = default; while (utf8JsonReader.Read()) { @@ -295,20 +173,6 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; - case "hasBaleen": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasBaleen = utf8JsonReader.GetBoolean(); - break; - case "hasTeeth": - if (utf8JsonReader.TokenType != JsonTokenType.Null) - hasTeeth = utf8JsonReader.GetBoolean(); - break; - case "type": - string typeRawValue = utf8JsonReader.GetString(); - type = typeRawValue == null - ? null - : Mammal.TypeEnumFromStringOrDefault(typeRawValue); - break; default: break; } @@ -318,26 +182,17 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Mammal."); - if (hasBaleen == null) - throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Mammal."); - - if (hasTeeth == null) - throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Mammal."); - - if (type == null) - throw new ArgumentNullException(nameof(type), "Property is required for class Mammal."); - Utf8JsonReader whaleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref whaleReader, jsonSerializerOptions, out Whale whale)) - return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(whale, className); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra zebra)) - return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(zebra, className); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig pig)) - return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); + return new Mammal(pig, className); throw new JsonException(); } @@ -360,14 +215,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", mammal.ClassName); - writer.WriteBoolean("hasBaleen", mammal.HasBaleen); - writer.WriteBoolean("hasTeeth", mammal.HasTeeth); - - var typeRawValue = Mammal.TypeEnumToJsonValue(mammal.Type); - if (typeRawValue != null) - writer.WriteString("type", typeRawValue); - else - writer.WriteNull("type"); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs index 31f6a6b909f..ea6ff8db1f7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public NullableShape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public NullableShape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class NullableShape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class NullableShape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class NullableShape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class NullableShape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); + return new NullableShape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new NullableShape(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", nullableShape.QuadrilateralType); writer.WriteString("shapeType", nullableShape.ShapeType); - writer.WriteString("triangleType", nullableShape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index e6827767a2f..f8d8807479d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -33,13 +33,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType) { SimpleQuadrilateral = simpleQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -48,13 +46,11 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType - /// shapeType [JsonConstructor] - public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType, string shapeType) + public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType) { ComplexQuadrilateral = complexQuadrilateral; QuadrilateralType = quadrilateralType; - ShapeType = shapeType; OnCreated(); } @@ -76,12 +72,6 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("quadrilateralType")] public string QuadrilateralType { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets additional properties /// @@ -97,7 +87,6 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Quadrilateral {\n"); sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -147,7 +136,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; - string shapeType = default; while (utf8JsonReader.Read()) { @@ -167,9 +155,6 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; default: break; } @@ -179,16 +164,13 @@ namespace Org.OpenAPITools.Model if (quadrilateralType == null) throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Quadrilateral."); - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Quadrilateral."); - Utf8JsonReader simpleQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref simpleQuadrilateralReader, jsonSerializerOptions, out SimpleQuadrilateral simpleQuadrilateral)) - return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); + return new Quadrilateral(complexQuadrilateral, quadrilateralType); throw new JsonException(); } @@ -209,7 +191,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); - writer.WriteString("shapeType", quadrilateral.ShapeType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs index 0183c25f725..832dafee68c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public Shape(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public Shape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public Shape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Shape {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class Shape."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class Shape."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new Shape(triangle, quadrilateralType, shapeType, triangleType); + return new Shape(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); + return new Shape(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shape.QuadrilateralType); writer.WriteString("shapeType", shape.ShapeType); - writer.WriteString("triangleType", shape.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 478f16265d7..dbd6455b7ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -32,16 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Triangle triangle, string shapeType) { Triangle = triangle; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -49,16 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// quadrilateralType /// shapeType - /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) + public ShapeOrNull(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; - QuadrilateralType = quadrilateralType; ShapeType = shapeType; - TriangleType = triangleType; OnCreated(); } @@ -74,24 +66,12 @@ namespace Org.OpenAPITools.Model /// public Quadrilateral Quadrilateral { get; set; } - /// - /// Gets or Sets QuadrilateralType - /// - [JsonPropertyName("quadrilateralType")] - public string QuadrilateralType { get; set; } - /// /// Gets or Sets ShapeType /// [JsonPropertyName("shapeType")] public string ShapeType { get; set; } - /// - /// Gets or Sets TriangleType - /// - [JsonPropertyName("triangleType")] - public string TriangleType { get; set; } - /// /// Gets or Sets additional properties /// @@ -106,7 +86,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ShapeOrNull {\n"); - sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -156,9 +135,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string quadrilateralType = default; string shapeType = default; - string triangleType = default; while (utf8JsonReader.Read()) { @@ -175,37 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "quadrilateralType": - quadrilateralType = utf8JsonReader.GetString(); - break; case "shapeType": shapeType = utf8JsonReader.GetString(); break; - case "triangleType": - triangleType = utf8JsonReader.GetString(); - break; default: break; } } } - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); - if (shapeType == null) throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeOrNull."); - if (triangleType == null) - throw new ArgumentNullException(nameof(triangleType), "Property is required for class ShapeOrNull."); - Utf8JsonReader triangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref triangleReader, jsonSerializerOptions, out Triangle triangle)) - return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(triangle, shapeType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); + return new ShapeOrNull(quadrilateral, shapeType); throw new JsonException(); } @@ -225,9 +190,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("quadrilateralType", shapeOrNull.QuadrilateralType); writer.WriteString("shapeType", shapeOrNull.ShapeType); - writer.WriteString("triangleType", shapeOrNull.TriangleType); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs index 97cacac540f..c66f2e216c4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -32,13 +32,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) + public Triangle(EquilateralTriangle equilateralTriangle, string triangleType) { EquilateralTriangle = equilateralTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -47,13 +45,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) + public Triangle(IsoscelesTriangle isoscelesTriangle, string triangleType) { IsoscelesTriangle = isoscelesTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -62,13 +58,11 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// - /// shapeType /// triangleType [JsonConstructor] - public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) + public Triangle(ScaleneTriangle scaleneTriangle, string triangleType) { ScaleneTriangle = scaleneTriangle; - ShapeType = shapeType; TriangleType = triangleType; OnCreated(); } @@ -90,12 +84,6 @@ namespace Org.OpenAPITools.Model /// public ScaleneTriangle ScaleneTriangle { get; set; } - /// - /// Gets or Sets ShapeType - /// - [JsonPropertyName("shapeType")] - public string ShapeType { get; set; } - /// /// Gets or Sets TriangleType /// @@ -116,7 +104,6 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Triangle {\n"); - sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -166,7 +153,6 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - string shapeType = default; string triangleType = default; while (utf8JsonReader.Read()) @@ -184,9 +170,6 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "shapeType": - shapeType = utf8JsonReader.GetString(); - break; case "triangleType": triangleType = utf8JsonReader.GetString(); break; @@ -196,23 +179,20 @@ namespace Org.OpenAPITools.Model } } - if (shapeType == null) - throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); - if (triangleType == null) throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); Utf8JsonReader equilateralTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref equilateralTriangleReader, jsonSerializerOptions, out EquilateralTriangle equilateralTriangle)) - return new Triangle(equilateralTriangle, shapeType, triangleType); + return new Triangle(equilateralTriangle, triangleType); Utf8JsonReader isoscelesTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref isoscelesTriangleReader, jsonSerializerOptions, out IsoscelesTriangle isoscelesTriangle)) - return new Triangle(isoscelesTriangle, shapeType, triangleType); + return new Triangle(isoscelesTriangle, triangleType); Utf8JsonReader scaleneTriangleReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref scaleneTriangleReader, jsonSerializerOptions, out ScaleneTriangle scaleneTriangle)) - return new Triangle(scaleneTriangle, shapeType, triangleType); + return new Triangle(scaleneTriangle, triangleType); throw new JsonException(); } @@ -234,7 +214,6 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); - writer.WriteString("shapeType", triangle.ShapeType); writer.WriteString("triangleType", triangle.TriangleType); writer.WriteEndObject();