From 5555137b7926de2f501e091718ff72429b808220 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 17 Jun 2023 03:05:08 -0400 Subject: [PATCH] [csharp][generichost] Modernizes handling of composed schemas (#15865) * removed hotfixes, improved composed schema handling * fix copy paste bug --- .../codegen/DefaultGenerator.java | 6 - .../languages/AbstractCSharpCodegen.java | 53 ++++- .../languages/CSharpClientCodegen.java | 107 ++-------- .../generichost/JsonConverter.mustache | 38 +--- .../generichost/ModelBaseSignature.mustache | 2 +- .../generichost/modelGeneric.mustache | 54 +---- .../.openapi-generator/FILES | 6 - .../README.md | 3 - .../api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../api/openapi.yaml | 59 +++--- .../docs/models/Cat.md | 1 + .../docs/models/ChildCat.md | 2 + .../docs/models/ComplexQuadrilateral.md | 2 + .../docs/models/Dog.md | 1 + .../docs/models/EquilateralTriangle.md | 2 + .../docs/models/Fruit.md | 3 + .../docs/models/FruitReq.md | 4 + .../docs/models/GmFruit.md | 3 + .../docs/models/IsoscelesTriangle.md | 2 + .../docs/models/Mammal.md | 4 + .../docs/models/NullableShape.md | 2 + .../docs/models/Pig.md | 1 + .../docs/models/Quadrilateral.md | 2 + .../docs/models/ScaleneTriangle.md | 2 + .../docs/models/Shape.md | 1 + .../docs/models/ShapeOrNull.md | 1 + .../docs/models/SimpleQuadrilateral.md | 2 + .../Org.OpenAPITools.Test/Model/CatTests.cs | 9 + .../Model/ChildCatTests.cs | 18 ++ .../Model/ComplexQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/DogTests.cs | 9 + .../Model/EquilateralTriangleTests.cs | 18 ++ .../Model/FruitReqTests.cs | 36 ++++ .../Org.OpenAPITools.Test/Model/FruitTests.cs | 27 +++ .../Model/GmFruitTests.cs | 27 +++ .../Model/IsoscelesTriangleTests.cs | 18 ++ .../Model/MammalTests.cs | 36 ++++ .../Model/NullableShapeTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/PigTests.cs | 9 + .../Model/QuadrilateralTests.cs | 18 ++ .../Model/ScaleneTriangleTests.cs | 18 ++ .../Model/ShapeOrNullTests.cs | 9 + .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 9 + .../Model/SimpleQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools/Client/ClientUtils.cs | 6 +- .../Client/HostConfiguration.cs | 3 - .../src/Org.OpenAPITools/Model/Cat.cs | 48 ++--- .../src/Org.OpenAPITools/Model/ChildCat.cs | 107 ++++++++-- .../Model/ComplexQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Dog.cs | 34 ++-- .../Model/EquilateralTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Fruit.cs | 87 +++++++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 92 ++++++++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 77 ++++++- .../Model/IsoscelesTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Mammal.cs | 191 +++++++++++++++++- .../Org.OpenAPITools/Model/NullableShape.cs | 69 ++++++- .../src/Org.OpenAPITools/Model/OneOfString.cs | 13 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 7 +- .../src/Org.OpenAPITools/Model/Pig.cs | 32 ++- .../Model/PolymorphicProperty.cs | 51 ++--- .../Org.OpenAPITools/Model/Quadrilateral.cs | 51 ++++- .../Org.OpenAPITools/Model/ScaleneTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Shape.cs | 50 ++++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 50 ++++- .../Model/SimpleQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 12 +- .../.openapi-generator/FILES | 6 - .../api/openapi.yaml | 59 +++--- .../docs/models/Cat.md | 1 + .../docs/models/ChildCat.md | 2 + .../docs/models/ComplexQuadrilateral.md | 2 + .../docs/models/Dog.md | 1 + .../docs/models/EquilateralTriangle.md | 2 + .../docs/models/Fruit.md | 3 + .../docs/models/FruitReq.md | 4 + .../docs/models/GmFruit.md | 3 + .../docs/models/IsoscelesTriangle.md | 2 + .../docs/models/Mammal.md | 4 + .../docs/models/NullableShape.md | 2 + .../docs/models/Pig.md | 1 + .../docs/models/Quadrilateral.md | 2 + .../docs/models/ScaleneTriangle.md | 2 + .../docs/models/Shape.md | 1 + .../docs/models/ShapeOrNull.md | 1 + .../docs/models/SimpleQuadrilateral.md | 2 + .../Org.OpenAPITools.Test/Model/CatTests.cs | 9 + .../Model/ChildCatTests.cs | 18 ++ .../Model/ComplexQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/DogTests.cs | 9 + .../Model/EquilateralTriangleTests.cs | 18 ++ .../Model/FruitReqTests.cs | 36 ++++ .../Org.OpenAPITools.Test/Model/FruitTests.cs | 27 +++ .../Model/GmFruitTests.cs | 27 +++ .../Model/IsoscelesTriangleTests.cs | 18 ++ .../Model/MammalTests.cs | 36 ++++ .../Model/NullableShapeTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/PigTests.cs | 9 + .../Model/QuadrilateralTests.cs | 18 ++ .../Model/ScaleneTriangleTests.cs | 18 ++ .../Model/ShapeOrNullTests.cs | 9 + .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 9 + .../Model/SimpleQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools/Client/ClientUtils.cs | 6 +- .../Client/HostConfiguration.cs | 3 - .../src/Org.OpenAPITools/Model/Cat.cs | 48 ++--- .../src/Org.OpenAPITools/Model/ChildCat.cs | 107 ++++++++-- .../Model/ComplexQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Dog.cs | 34 ++-- .../Model/EquilateralTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Fruit.cs | 85 +++++++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 92 ++++++++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 75 ++++++- .../Model/IsoscelesTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Mammal.cs | 191 +++++++++++++++++- .../Org.OpenAPITools/Model/NullableShape.cs | 69 ++++++- .../src/Org.OpenAPITools/Model/OneOfString.cs | 11 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 7 +- .../src/Org.OpenAPITools/Model/Pig.cs | 32 ++- .../Model/PolymorphicProperty.cs | 45 +++-- .../Org.OpenAPITools/Model/Quadrilateral.cs | 51 ++++- .../Org.OpenAPITools/Model/ScaleneTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Shape.cs | 50 ++++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 50 ++++- .../Model/SimpleQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 6 + .../.openapi-generator/FILES | 4 - .../api/openapi.yaml | 28 +-- .../docs/models/Adult.md | 1 + .../docs/models/Child.md | 1 + .../Org.OpenAPITools.Test/Model/AdultTests.cs | 9 + .../Org.OpenAPITools.Test/Model/ChildTests.cs | 9 + .../Client/HostConfiguration.cs | 2 - .../src/Org.OpenAPITools/Model/Adult.cs | 37 ++-- .../src/Org.OpenAPITools/Model/Child.cs | 47 +++-- .../docs/models/Fruit.md | 2 + .../Org.OpenAPITools.Test/Model/FruitTests.cs | 18 ++ .../src/Org.OpenAPITools/Model/Fruit.cs | 44 +++- .../docs/models/Fruit.md | 2 + .../Org.OpenAPITools.Test/Model/FruitTests.cs | 18 ++ .../src/Org.OpenAPITools/Model/Fruit.cs | 52 ++++- .../.openapi-generator/FILES | 6 - .../api/openapi.yaml | 59 +++--- .../docs/models/Cat.md | 1 + .../docs/models/ChildCat.md | 2 + .../docs/models/ComplexQuadrilateral.md | 2 + .../docs/models/Dog.md | 1 + .../docs/models/EquilateralTriangle.md | 2 + .../docs/models/Fruit.md | 3 + .../docs/models/FruitReq.md | 4 + .../docs/models/GmFruit.md | 3 + .../docs/models/IsoscelesTriangle.md | 2 + .../docs/models/Mammal.md | 4 + .../docs/models/NullableShape.md | 2 + .../docs/models/Pig.md | 1 + .../docs/models/Quadrilateral.md | 2 + .../docs/models/ScaleneTriangle.md | 2 + .../docs/models/Shape.md | 1 + .../docs/models/ShapeOrNull.md | 1 + .../docs/models/SimpleQuadrilateral.md | 2 + .../Org.OpenAPITools.Test/Model/CatTests.cs | 9 + .../Model/ChildCatTests.cs | 18 ++ .../Model/ComplexQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/DogTests.cs | 9 + .../Model/EquilateralTriangleTests.cs | 18 ++ .../Model/FruitReqTests.cs | 36 ++++ .../Org.OpenAPITools.Test/Model/FruitTests.cs | 27 +++ .../Model/GmFruitTests.cs | 27 +++ .../Model/IsoscelesTriangleTests.cs | 18 ++ .../Model/MammalTests.cs | 36 ++++ .../Model/NullableShapeTests.cs | 18 ++ .../Org.OpenAPITools.Test/Model/PigTests.cs | 9 + .../Model/QuadrilateralTests.cs | 18 ++ .../Model/ScaleneTriangleTests.cs | 18 ++ .../Model/ShapeOrNullTests.cs | 9 + .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 9 + .../Model/SimpleQuadrilateralTests.cs | 18 ++ .../Org.OpenAPITools/Client/ClientUtils.cs | 6 +- .../Client/HostConfiguration.cs | 3 - .../src/Org.OpenAPITools/Model/Cat.cs | 48 ++--- .../src/Org.OpenAPITools/Model/ChildCat.cs | 107 ++++++++-- .../Model/ComplexQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Dog.cs | 34 ++-- .../Model/EquilateralTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Fruit.cs | 85 +++++++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 92 ++++++++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 75 ++++++- .../Model/IsoscelesTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Mammal.cs | 191 +++++++++++++++++- .../Org.OpenAPITools/Model/NullableShape.cs | 69 ++++++- .../src/Org.OpenAPITools/Model/OneOfString.cs | 11 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 7 +- .../src/Org.OpenAPITools/Model/Pig.cs | 32 ++- .../Model/PolymorphicProperty.cs | 45 +++-- .../Org.OpenAPITools/Model/Quadrilateral.cs | 51 ++++- .../Org.OpenAPITools/Model/ScaleneTriangle.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Shape.cs | 50 ++++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 50 ++++- .../Model/SimpleQuadrilateral.cs | 51 +++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 6 + .../.openapi-generator/FILES | 6 - .../OpenAPIClient-httpclient/README.md | 3 - .../OpenAPIClient-httpclient/api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../OpenAPIClient-net47/README.md | 3 - .../OpenAPIClient-net47/api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../OpenAPIClient-net48/README.md | 3 - .../OpenAPIClient-net48/api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../OpenAPIClient-net5.0/README.md | 3 - .../OpenAPIClient-net5.0/api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../OpenAPIClient-unityWebRequest/README.md | 3 - .../api/openapi.yaml | 59 +++--- .../OpenAPIClient/.openapi-generator/FILES | 6 - .../csharp-netcore/OpenAPIClient/README.md | 3 - .../OpenAPIClient/api/openapi.yaml | 59 +++--- .../.openapi-generator/FILES | 6 - .../OpenAPIClientCore/README.md | 3 - .../OpenAPIClientCore/api/openapi.yaml | 59 +++--- 222 files changed, 4580 insertions(+), 1412 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 967af1a9cc0..e59f83a47ce 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -270,12 +270,6 @@ public class DefaultGenerator implements Generator { InlineModelResolver inlineModelResolver = new InlineModelResolver(); inlineModelResolver.setInlineSchemaNameMapping(config.inlineSchemaNameMapping()); inlineModelResolver.setInlineSchemaNameDefaults(config.inlineSchemaNameDefault()); - if (inlineModelResolver.refactorAllOfInlineSchemas == null && // option not set - config instanceof CSharpClientCodegen) { // default to true for csharp-netcore generator - inlineModelResolver.refactorAllOfInlineSchemas = true; - LOGGER.info("inlineModelResolver.refactorAllOfInlineSchemas is default to true instead of false for `csharp-netcore` generator." + - "Add --inline-schema-name-defaults REFACTOR_ALLOF_INLINE_SCHEMAS=false in CLI for example to set it to false instead."); - } inlineModelResolver.flatten(openAPI); } 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 575664eba13..492783ddec7 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 @@ -495,6 +495,32 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co CodegenModel model = ModelUtils.getModelByName(entry.getKey(), objs); removeCircularReferencesInComposedSchemas(model); + CodegenComposedSchemas composedSchemas = model.getComposedSchemas(); + if (composedSchemas != null) { + List allOf = composedSchemas.getAllOf(); + if (allOf != null) { + for(CodegenProperty property : allOf) { + property.name = patchPropertyName(model, property.baseType); + } + } + + List anyOf = composedSchemas.getAnyOf(); + if (anyOf != null) { + for(CodegenProperty property : anyOf) { + property.name = patchPropertyName(model, property.baseType); + property.isNullable = true; + } + } + + List oneOf = composedSchemas.getOneOf(); + if (oneOf != null) { + for(CodegenProperty property : oneOf) { + property.name = patchPropertyName(model, property.baseType); + property.isNullable = true; + } + } + } + // https://github.com/OpenAPITools/openapi-generator/issues/12324 // TODO: why do these collections contain different instances? // fixing allVars should suffice instead of patching every collection @@ -526,7 +552,22 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co return processed; } - private void patchProperty(Map enumRefs, CodegenModel model, CodegenProperty property) { + 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 + // so test if the name was escaped and then replace var with Var + String tmpPropertyName = escapeReservedWord(model, value); + if (!value.equals(tmpPropertyName) || value.startsWith(this.invalidNamePrefix)) { + value = tmpPropertyName; + String firstCharacter = value.substring(0, 1); + value = value.substring(1); + value = firstCharacter.toUpperCase(Locale.ROOT) + value; + } + + return value; + } + + protected void patchProperty(Map enumRefs, CodegenModel model, CodegenProperty property) { if (enumRefs.containsKey(property.dataType)) { // Handle any enum properties referred to by $ref. // This is different in C# than most other generators, because enums in C# are compiled to integral types, @@ -554,15 +595,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } String tmpPropertyName = escapeReservedWord(model, property.name); - if (!property.name.equals(tmpPropertyName) || property.name.startsWith(this.invalidNamePrefix)) { - // 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 - // so test if the name was escaped and then replace var with Var - property.name = tmpPropertyName; - String firstCharacter = property.name.substring(0, 1); - property.name = property.name.substring(1); - property.name = firstCharacter.toUpperCase(Locale.ROOT) + property.name; - } + property.name = patchPropertyName(model, property.name); // fix incorrect data types for maps of maps if (property.datatypeWithEnum.endsWith(", List>") && property.items != null) { 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 cbf9d648037..fabf1760468 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 @@ -23,6 +23,7 @@ import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.servers.Server; +import org.mozilla.javascript.optimizer.Codegen; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; @@ -1520,6 +1521,19 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { } } + @Override + protected void patchProperty(Map enumRefs, CodegenModel model, CodegenProperty property) { + super.patchProperty(enumRefs, model, property); + + if (!GENERICHOST.equals(getLibrary()) || model.parentModel == null) { + return; + } + + if (model.parentModel.allVars.stream().anyMatch(v -> v.baseName.equals(property.baseName))){ + property.isInherited = true; + } + } + @Override public ModelsMap postProcessModels(ModelsMap objs) { objs = super.postProcessModels(objs); @@ -1564,75 +1578,6 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { return objs; } - /** - * ISSUE: https://github.com/OpenAPITools/openapi-generator/issues/11846 - * Ensures that a model has all inherited properties - * Check modules\openapi-generator\src\test\resources\3_0\java\petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml - * Without this method, property petType in GrandparentAnimal will not make it through ParentPet and into ChildCat - */ - private void ensureInheritedPropertiesArePresent(CodegenModel derivedModel) { - // every c# generator should definitely want this, or we should fix the issue - // still, lets avoid breaking changes :( - if (Boolean.FALSE.equals(GENERICHOST.equals(getLibrary()))) { - return; - } - - if (derivedModel.parentModel == null) { - return; - } - - for (CodegenProperty parentProperty : derivedModel.parentModel.allVars) { - if (Boolean.FALSE.equals(derivedModel.allVars.stream().anyMatch(v -> v.baseName.equals(parentProperty.baseName)))) { - CodegenProperty clone = parentProperty.clone(); - clone.isInherited = true; - LOGGER.debug("Inherited property " + clone.name + " from model" + derivedModel.parentModel.classname + " was not found in " + derivedModel.classname + ". Adding a clone now."); - derivedModel.allVars.add(clone); - } - } - - ensureInheritedPropertiesArePresent(derivedModel.parentModel); - } - - /** - * Invoked by {@link DefaultGenerator} after all models have been post-processed, allowing for a last pass of codegen-specific model cleanup. - * - * @param objs Current state of codegen object model. - * @return An in-place modified state of the codegen object model. - */ - @Override - public Map postProcessAllModels(Map objs) { - objs = super.postProcessAllModels(objs); - - // other libraries probably want these fixes, but lets avoid breaking changes for now - if (Boolean.FALSE.equals(GENERICHOST.equals(getLibrary()))) { - return objs; - } - - ArrayList allModels = new ArrayList<>(); - for (String key : objs.keySet()) { - CodegenModel model = ModelUtils.getModelByName(key, objs); - allModels.add(model); - } - - for (CodegenModel cm : allModels) { - cm.anyOf.forEach(anyOf -> removePropertiesDeclaredInComposedClass(anyOf, allModels, cm)); - cm.oneOf.forEach(oneOf -> removePropertiesDeclaredInComposedClass(oneOf, allModels, cm)); - cm.allOf.forEach(allOf -> removePropertiesDeclaredInComposedClass(allOf, allModels, cm)); - - if (cm.getComposedSchemas() != null && cm.getComposedSchemas().getAllOf() != null && !cm.getComposedSchemas().getAllOf().isEmpty()) { - cm.getComposedSchemas().getAllOf().forEach(allOf -> { - if (allOf.dataType.equals(cm.parent)) { - allOf.isInherited = true; - } - }); - } - - ensureInheritedPropertiesArePresent(cm); - } - - return objs; - } - /** * Return true if the property being passed is a C# value type * @@ -1647,30 +1592,6 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { : this.getValueTypes().contains(var.dataType) || var.isEnum; } - /** - * Removes properties from a model which are also defined in a composed class. - * - * @param className The name which may be a composed model - * @param allModels A collection of all CodegenModel - * @param cm The CodegenModel to correct - */ - private void removePropertiesDeclaredInComposedClass(String className, List allModels, CodegenModel cm) { - CodegenModel otherModel = allModels.stream().filter(m -> m.classname.equals(className)).findFirst().orElse(null); - if (otherModel == null) { - return; - } - - otherModel.readWriteVars.stream().filter(v -> cm.readWriteVars.stream().anyMatch(cmV -> cmV.baseName.equals(v.baseName))).collect(Collectors.toList()) - .forEach(v -> { - cm.readWriteVars.removeIf(item -> item.baseName.equals(v.baseName)); - cm.vars.removeIf(item -> item.baseName.equals(v.baseName)); - cm.readOnlyVars.removeIf(item -> item.baseName.equals(v.baseName)); - cm.requiredVars.removeIf(item -> item.baseName.equals(v.baseName)); - cm.allVars.removeIf(item -> item.baseName.equals(v.baseName)); - cm.nonNullableVars.removeIf(item -> item.baseName.equals(v.baseName)); - }); - } - @Override public void postProcess() { System.out.println("################################################################################"); diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index 23f2730109b..f92feabf9c0 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -38,18 +38,11 @@ {{#composedSchemas.anyOf}} {{^vendorExtensions.x-duplicated-data-type}} - Utf8JsonReader {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Reader = utf8JsonReader; - bool {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Deserialized = Client.ClientUtils.TryDeserialize<{{{dataType}}}>(ref {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Reader, jsonSerializerOptions, out {{{dataType}}}{{^isBoolean}}{{nrt?}}{{/isBoolean}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}); + Utf8JsonReader {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Reader = utf8JsonReader; + bool {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Deserialized = Client.ClientUtils.TryDeserialize<{{{dataType}}}>(ref {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Reader, jsonSerializerOptions, out {{{dataType}}}{{^isBoolean}}{{nrt?}}{{/isBoolean}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); {{/vendorExtensions.x-duplicated-data-type}} {{/composedSchemas.anyOf}} - {{#composedSchemas.allOf}} - {{^isInherited}} - Utf8JsonReader {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Reader = utf8JsonReader; - bool {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Deserialized = Client.ClientUtils.TryDeserialize<{{{dataType}}}>(ref utf8JsonReader, jsonSerializerOptions, out {{{dataType}}}{{^isBoolean}}{{nrt?}}{{/isBoolean}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}); - - {{/isInherited}} - {{/composedSchemas.allOf}} {{#allVars}} {{#isInnerEnum}}{{^isMap}}{{classname}}.{{/isMap}}{{/isInnerEnum}}{{#nrt}}{{#lambda.optional}}{{{datatypeWithEnum}}}{{/lambda.optional}}{{/nrt}}{{^nrt}}{{{datatypeWithEnum}}}{{#vendorExtensions.x-csharp-value-type}}?{{/vendorExtensions.x-csharp-value-type}}{{/nrt}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = default; {{#-last}} @@ -182,9 +175,9 @@ {{/allVars}} {{#composedSchemas.oneOf}} {{^vendorExtensions.x-duplicated-data-type}} - Utf8JsonReader {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Reader = utf8JsonReader; - if (Client.ClientUtils.TryDeserialize<{{{dataType}}}>(ref {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Reader, jsonSerializerOptions, out {{{dataType}}}{{^isBoolean}}{{nrt?}}{{/isBoolean}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}})) - return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_param}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{#model.composedSchemas.allOf}}{{^isInherited}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{/isInherited}}{{/model.composedSchemas.allOf}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/allVars}}{{/lambda.joinWithComma}}); + Utf8JsonReader {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Reader = utf8JsonReader; + if (Client.ClientUtils.TryDeserialize<{{{dataType}}}>(ref {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Reader, jsonSerializerOptions, out {{{dataType}}}{{^isBoolean}}{{nrt?}}{{/isBoolean}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}})) + return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_param}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{#model.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/allVars}}{{/lambda.joinWithComma}}); {{/vendorExtensions.x-duplicated-data-type}} {{#-last}} @@ -192,14 +185,7 @@ {{/-last}} {{/composedSchemas.oneOf}} {{^composedSchemas.oneOf}} - {{#model.composedSchemas.allOf}} - {{^isInherited}} - if ({{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} == null) - throw new ArgumentNullException(nameof({{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}), "Property is required for class {{classname}}."); - - {{/isInherited}} - {{/model.composedSchemas.allOf}} - return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.allOf}}{{^isInherited}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/isInherited}}{{/model.composedSchemas.allOf}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/allVars}}{{/lambda.joinWithComma}}); + return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/allVars}}{{/lambda.joinWithComma}}); {{/composedSchemas.oneOf}} } @@ -215,23 +201,16 @@ {{#lambda.trimLineBreaks}} {{#composedSchemas.anyOf}} {{^vendorExtensions.x-duplicated-data-type}} - System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}, jsonSerializerOptions); {{/vendorExtensions.x-duplicated-data-type}} {{/composedSchemas.anyOf}} {{#composedSchemas.oneOf}} {{^vendorExtensions.x-duplicated-data-type}} - System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}, jsonSerializerOptions); {{/vendorExtensions.x-duplicated-data-type}} {{/composedSchemas.oneOf}} - {{#composedSchemas.allOf}} - {{^isInherited}} - System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}, jsonSerializerOptions); - - {{/isInherited}} - {{/composedSchemas.allOf}} - {{^composedSchemas}} writer.WriteStartObject(); {{#allVars}} @@ -395,7 +374,6 @@ {{/allVars}} writer.WriteEndObject(); - {{/composedSchemas}} {{/lambda.trimLineBreaks}} } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache index cded3cc164b..3a1e7c35d69 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache @@ -1 +1 @@ -{{#parentModel.composedSchemas.allOf}}{{^isInherited}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} {{/isInherited}}{{/parentModel.composedSchemas.allOf}}{{#parentModel.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.anyOf}}{{#allVars}}{{#isInherited}}{{^isNew}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/isNew}}{{#isNew}}{{#isEnum}}{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}){{/isEnum}}{{^isEnum}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}.ToString(){{/isEnum}}{{/isNew}} {{/isInherited}}{{/allVars}} \ No newline at end of file +{{#parentModel.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.anyOf}}{{#allVars}}{{#isInherited}}{{^isNew}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/isNew}}{{#isNew}}{{#isEnum}}{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}){{/isEnum}}{{^isEnum}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}.ToString(){{/isEnum}}{{/isNew}} {{/isInherited}}{{/allVars}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache index 545568c8a9d..66ff8ef0c3e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache @@ -8,28 +8,20 @@ /// /// Initializes a new instance of the class. /// - /// - {{#composedSchemas.allOf}} - {{^isInherited}} - /// - {{/isInherited}} - {{/composedSchemas.allOf}} + /// {{#composedSchemas.anyOf}} - /// + /// {{/composedSchemas.anyOf}} {{#allVars}} /// {{description}}{{^description}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} [JsonConstructor] - {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{#model.composedSchemas.allOf}}{{^isInherited}}{{{dataType}}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/isInherited}}{{/model.composedSchemas.allOf}}{{#model.composedSchemas.anyOf}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.is-value-type}}?{{/vendorExtensions.is-value-type}}{{/nrt}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} {{#model.composedSchemas.anyOf}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { - {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; - {{#composedSchemas.allOf}} - {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; - {{/composedSchemas.allOf}} {{#composedSchemas.anyOf}} - {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; + {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}}; {{/composedSchemas.anyOf}} + {{name}} = {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}}; {{#allVars}} {{^isInherited}} {{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; @@ -49,27 +41,17 @@ /// /// Initializes a new instance of the class. /// - {{#composedSchemas.allOf}} - {{^isInherited}} - /// - {{/isInherited}} - {{/composedSchemas.allOf}} {{#composedSchemas.anyOf}} - /// + /// {{/composedSchemas.anyOf}} {{#allVars}} /// {{description}}{{^description}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} [JsonConstructor] - {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.allOf}}{{^isInherited}}{{{dataType}}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/isInherited}}{{/composedSchemas.allOf}}{{#composedSchemas.anyOf}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{{name}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { - {{#composedSchemas.allOf}} - {{^isInherited}} - {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; - {{/isInherited}} - {{/composedSchemas.allOf}} {{#composedSchemas.anyOf}} - {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}; + {{#lambda.titlecase}}{{name}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.titlecase}}{{name}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}; {{/composedSchemas.anyOf}} {{#allVars}} {{^isInherited}} @@ -137,7 +119,7 @@ {{#composedSchemas.oneOf}} {{^vendorExtensions.x-duplicated-data-type}} /// - /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}{{/description}} + /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{/description}} /// {{#description}} /// {{.}}{{/description}} {{#example}} @@ -146,26 +128,10 @@ {{#deprecated}} [Obsolete] {{/deprecated}} - public {{{dataType}}}{{nrt?}} {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} { get; {{^isReadOnly}}set; {{/isReadOnly}}} + public {{{dataType}}}{{nrt?}} {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}} { get; {{^isReadOnly}}set; {{/isReadOnly}}} {{/vendorExtensions.x-duplicated-data-type}} {{/composedSchemas.oneOf}} - {{#composedSchemas.allOf}} - {{^isInherited}} - /// - /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}{{/description}} - /// {{#description}} - /// {{.}}{{/description}} - {{#example}} - /// {{.}} - {{/example}} - {{#deprecated}} - [Obsolete] - {{/deprecated}} - public {{{dataType}}} {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} { get; {{^isReadOnly}}set; {{/isReadOnly}}} - - {{/isInherited}} - {{/composedSchemas.allOf}} {{#allVars}} {{^isEnum}} {{#isInherited}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES index 53972796813..71c7c4d5427 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -142,17 +139,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md index 98d5c519793..d63a03725fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md @@ -164,17 +164,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES index d1fbcff0c4b..0ab733136b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES @@ -25,17 +25,14 @@ docs/models/BananaReq.md docs/models/BasquePig.md docs/models/Capitalization.md docs/models/Cat.md -docs/models/CatAllOf.md docs/models/Category.md docs/models/ChildCat.md -docs/models/ChildCatAllOf.md docs/models/ClassModel.md docs/models/ComplexQuadrilateral.md docs/models/DanishPig.md docs/models/DateOnlyClass.md docs/models/DeprecatedObject.md docs/models/Dog.md -docs/models/DogAllOf.md docs/models/Drawing.md docs/models/EnumArrays.md docs/models/EnumClass.md @@ -148,17 +145,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md index 16db4a55bd3..310a5e6575e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Declawed** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md index dae2ff76026..b8f7d81fbbe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md @@ -4,6 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] +**PetType** | **string** | | [optional] [default to PetTypeEnum.ChildCat] [[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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md index 0926bb55e71..fb00d4ebf08 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md index b1e39dcf07c..70cdc80e83e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Breed** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md index ddc9885fe56..8360b5c16a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md index b3bee18f7ba..1a298dac767 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md index 38ab0c1a6ca..5217febc9b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md index 584c4fd323d..49b24074b79 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md index ed481ad1448..07c62ac9338 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md index 5546632e4d6..82a8ca6027b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md index 0caa1aa5b9d..948b6d047ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md @@ -5,6 +5,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md index 83e58b6098d..fd7bb9359ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md @@ -4,6 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**ClassName** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md index 4fd16b32ea5..d1c44507419 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md index a01c2edc068..d3f15354bcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md index 2ec279cef3c..e0225d8dd49 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md @@ -5,6 +5,7 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md index 056fcbfdbdd..3f11685aced 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md @@ -6,6 +6,7 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md index 3bc21009b7e..a9c7f93b67a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs index fbb05465b35..a5d4bf43bbf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Cat //Assert.IsType(instance); } + + /// + /// Test the property 'Declawed' + /// + [Fact] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index 1ff1a3861e0..2c02364a9f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ChildCat //Assert.IsType(instance); } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + /// + /// Test the property 'PetType' + /// + [Fact] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 035955566f1..a7a864154ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ComplexQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs index e0dd382307d..b8e8bca0538 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Dog //Assert.IsType(instance); } + + /// + /// Test the property 'Breed' + /// + [Fact] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 393672d3f1a..f8d3daec3fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" EquilateralTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index a33c55ae487..504e060f55c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" FruitReq //Assert.IsType(instance); } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Mealy' + /// + [Fact] + public void MealyTest() + { + // TODO unit test for the property 'Mealy' + } + + /// + /// Test the property 'Sweet' + /// + [Fact] + public void SweetTest() + { + // TODO unit test for the property 'Sweet' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 46448efc62f..3bf452bddcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 7e79cd06792..5473b8bbaf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index df5fed5444a..464750233cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" IsoscelesTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs index c35e65e9dd3..e1779a30d0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Mammal //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + + /// + /// Test the property 'HasBaleen' + /// + [Fact] + public void HasBaleenTest() + { + // TODO unit test for the property 'HasBaleen' + } + + /// + /// Test the property 'HasTeeth' + /// + [Fact] + public void HasTeethTest() + { + // TODO unit test for the property 'HasTeeth' + } + + /// + /// Test the property 'Type' + /// + [Fact] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index f7fbf947051..b2d5d209920 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" NullableShape //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0cea8ec786f..bd052bc705b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Pig //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index 61086c1d7b3..53484304010 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Quadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index 68693398f5c..085d3e550a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ScaleneTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index 695a7b13c13..c5d411e42d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index 097e541b3b0..a0da7d9d515 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 66a19a05af5..baa6e1e9f6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" SimpleQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs index bd413665655..de2b162ad3a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -130,8 +130,8 @@ namespace Org.OpenAPITools.Client return boolean ? "true" : "false"; - if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) - return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is ChildCat.PetTypeEnum childCatPetTypeEnum) + return ChildCat.PetTypeEnumToJsonValue(childCatPetTypeEnum); if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) @@ -148,6 +148,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8d419fe74cd..1226c8fe703 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -57,17 +57,14 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new BasquePigJsonConverter()); _jsonOptions.Converters.Add(new CapitalizationJsonConverter()); _jsonOptions.Converters.Add(new CatJsonConverter()); - _jsonOptions.Converters.Add(new CatAllOfJsonConverter()); _jsonOptions.Converters.Add(new CategoryJsonConverter()); _jsonOptions.Converters.Add(new ChildCatJsonConverter()); - _jsonOptions.Converters.Add(new ChildCatAllOfJsonConverter()); _jsonOptions.Converters.Add(new ClassModelJsonConverter()); _jsonOptions.Converters.Add(new ComplexQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new DanishPigJsonConverter()); _jsonOptions.Converters.Add(new DateOnlyClassJsonConverter()); _jsonOptions.Converters.Add(new DeprecatedObjectJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter()); - _jsonOptions.Converters.Add(new DogAllOfJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumClassConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs index acd6bcd8d93..a7d837574ab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs @@ -33,29 +33,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// /// className + /// declawed /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) + public Cat(string className, bool declawed, string color = @"red") : base(className, color) { - Dictionary = dictionary; - CatAllOf = catAllOf; + Declawed = declawed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Dictionary + /// Gets or Sets Declawed /// - public Dictionary Dictionary { get; set; } - - /// - /// Gets or Sets CatAllOf - /// - public CatAllOf CatAllOf { get; set; } + [JsonPropertyName("declawed")] + public bool Declawed { get; set; } /// /// Returns the string presentation of the object @@ -66,6 +60,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Cat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -93,13 +88,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dictionaryReader = utf8JsonReader; - bool dictionaryDeserialized = Client.ClientUtils.TryDeserialize>(ref utf8JsonReader, jsonSerializerOptions, out Dictionary? dictionary); - - Utf8JsonReader catAllOfReader = utf8JsonReader; - bool catAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out CatAllOf? catAllOf); - string? className = default; + bool? declawed = default; string? color = default; while (utf8JsonReader.Read()) @@ -120,6 +110,10 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; + case "declawed": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); + break; case "color": color = utf8JsonReader.GetString(); break; @@ -132,16 +126,13 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Cat."); + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class Cat."); + if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Cat."); - if (dictionary == null) - throw new ArgumentNullException(nameof(dictionary), "Property is required for class Cat."); - - if (catAllOf == null) - throw new ArgumentNullException(nameof(catAllOf), "Property is required for class Cat."); - - return new Cat(dictionary, catAllOf, className, color); + return new Cat(className, declawed.Value, color); } /// @@ -153,10 +144,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Cat cat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, cat.Dictionary, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, cat.CatAllOf, jsonSerializerOptions); + writer.WriteString("className", cat.ClassName); + writer.WriteBoolean("declawed", cat.Declawed); + writer.WriteString("color", cat.Color); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs index 655b425ca92..3694a68af83 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs @@ -33,21 +33,81 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// petType + /// name + /// petType (default to PetTypeEnum.ChildCat) [JsonConstructor] - internal ChildCat(ChildCatAllOf childCatAllOf, string petType) : base(petType) + public ChildCat(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) : base(ChildCat.PetTypeEnumToJsonValue(petType)) { - ChildCatAllOf = childCatAllOf; + Name = name; + PetType = petType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ChildCatAllOf + /// Defines PetType /// - public ChildCatAllOf ChildCatAllOf { get; set; } + public enum PetTypeEnum + { + /// + /// Enum ChildCat for value: ChildCat + /// + ChildCat = 1 + } + + /// + /// Returns a + /// + /// + /// + /// + public static PetTypeEnum PetTypeEnumFromString(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + throw new NotImplementedException($"Could not convert value to type PetTypeEnum: '{value}'"); + } + + /// + /// Returns a + /// + /// + /// + public static PetTypeEnum? PetTypeEnumFromStringOrDefault(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string PetTypeEnumToJsonValue(PetTypeEnum value) + { + if (value == PetTypeEnum.ChildCat) + return "ChildCat"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + + /// + /// Gets or Sets PetType + /// + [JsonPropertyName("pet_type")] + public new PetTypeEnum PetType { get; set; } + + /// + /// Gets or Sets Name + /// + [JsonPropertyName("name")] + public string Name { get; set; } /// /// Returns the string presentation of the object @@ -58,6 +118,8 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class ChildCat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -85,10 +147,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader childCatAllOfReader = utf8JsonReader; - bool childCatAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ChildCatAllOf? childCatAllOf); - - string? petType = default; + string? name = default; + ChildCat.PetTypeEnum? petType = default; while (utf8JsonReader.Read()) { @@ -105,8 +165,14 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "name": + name = utf8JsonReader.GetString(); + break; case "pet_type": - petType = utf8JsonReader.GetString(); + string? petTypeRawValue = utf8JsonReader.GetString(); + petType = petTypeRawValue == null + ? null + : ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); break; default: break; @@ -114,13 +180,13 @@ namespace Org.OpenAPITools.Model } } + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCat."); + if (petType == null) throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCat."); - if (childCatAllOf == null) - throw new ArgumentNullException(nameof(childCatAllOf), "Property is required for class ChildCat."); - - return new ChildCat(childCatAllOf, petType); + return new ChildCat(name, petType.Value); } /// @@ -132,8 +198,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ChildCat childCat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, childCat.ChildCatAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("name", childCat.Name); + + var petTypeRawValue = ChildCat.PetTypeEnumToJsonValue(childCat.PetType); + if (petTypeRawValue != null) + writer.WriteString("pet_type", petTypeRawValue); + else + writer.WriteNull("pet_type"); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 8bd753c94f1..ee9aec7f4f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -33,27 +33,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal ComplexQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public ComplexQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -69,6 +71,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ComplexQuadrilateral {\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(); @@ -107,11 +111,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface? shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface? quadrilateralInterface); + string? quadrilateralType = default; + string? shapeType = default; while (utf8JsonReader.Read()) { @@ -128,19 +129,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ComplexQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ComplexQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class ComplexQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ComplexQuadrilateral."); - return new ComplexQuadrilateral(shapeInterface, quadrilateralInterface); + return new ComplexQuadrilateral(quadrilateralType, shapeType); } /// @@ -152,10 +159,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ComplexQuadrilateral complexQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", complexQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", complexQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs index cdffa70c4e2..6df1e23f027 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs @@ -33,22 +33,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// breed /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) + public Dog(string breed, string className, string color = @"red") : base(className, color) { - DogAllOf = dogAllOf; + Breed = breed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets DogAllOf + /// Gets or Sets Breed /// - public DogAllOf DogAllOf { get; set; } + [JsonPropertyName("breed")] + public string Breed { get; set; } /// /// Returns the string presentation of the object @@ -59,6 +60,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Dog {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -86,9 +88,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dogAllOfReader = utf8JsonReader; - bool dogAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out DogAllOf? dogAllOf); - + string? breed = default; string? className = default; string? color = default; @@ -107,6 +107,9 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "breed": + breed = utf8JsonReader.GetString(); + break; case "className": className = utf8JsonReader.GetString(); break; @@ -119,16 +122,16 @@ namespace Org.OpenAPITools.Model } } + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class Dog."); + if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Dog."); if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Dog."); - if (dogAllOf == null) - throw new ArgumentNullException(nameof(dogAllOf), "Property is required for class Dog."); - - return new Dog(dogAllOf, className, color); + return new Dog(breed, className, color); } /// @@ -140,8 +143,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Dog dog, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, dog.DogAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("breed", dog.Breed); + writer.WriteString("className", dog.ClassName); + writer.WriteString("color", dog.Color); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 36034cdb631..002fddd826d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -33,27 +33,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal EquilateralTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public EquilateralTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -69,6 +71,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class EquilateralTriangle {\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"); return sb.ToString(); @@ -107,11 +111,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface? shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface? triangleInterface); + string? shapeType = default; + string? triangleType = default; while (utf8JsonReader.Read()) { @@ -128,19 +129,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class EquilateralTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class EquilateralTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class EquilateralTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class EquilateralTriangle."); - return new EquilateralTriangle(shapeInterface, triangleInterface); + return new EquilateralTriangle(shapeType, triangleType); } /// @@ -152,10 +159,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, EquilateralTriangle equilateralTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", equilateralTriangle.ShapeType); + writer.WriteString("triangleType", equilateralTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs index 59043b57682..ad791fef1b3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs @@ -33,12 +33,18 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Apple? apple, string color) + public Fruit(Apple? apple, string cultivar, decimal lengthCm, string origin, string color) { Apple = apple; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -47,11 +53,17 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Banana banana, string color) + public Fruit(Banana? banana, string cultivar, decimal lengthCm, string origin, string color) { Banana = banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -68,6 +80,24 @@ 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 /// @@ -83,6 +113,9 @@ 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(); } @@ -94,6 +127,20 @@ 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; } } @@ -120,6 +167,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string? cultivar = default; + decimal? lengthCm = default; + string? origin = default; string? color = default; while (utf8JsonReader.Read()) @@ -137,6 +187,16 @@ 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; @@ -146,16 +206,25 @@ 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, color); + return new Fruit(apple, cultivar, lengthCm.Value, origin, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana)) - return new Fruit(banana, color); + return new Fruit(banana, cultivar, lengthCm.Value, origin, color); throw new JsonException(); } @@ -173,6 +242,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs index 2138c33b493..1d6bb123537 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs @@ -34,10 +34,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(AppleReq appleReq) + public FruitReq(AppleReq? appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { AppleReq = appleReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -45,10 +53,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(BananaReq bananaReq) + public FruitReq(BananaReq? bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { BananaReq = bananaReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -64,6 +80,30 @@ 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 /// @@ -72,6 +112,10 @@ 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(); } @@ -109,6 +153,11 @@ 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) @@ -124,19 +173,46 @@ 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); + return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq? bananaReq)) - return new FruitReq(bananaReq); + return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); throw new JsonException(); } @@ -154,6 +230,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruitReq.BananaReq, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs index 6d56b17fbb0..feb9c389fec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs @@ -33,14 +33,20 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public GmFruit(Apple? apple, Banana banana, string color) + public GmFruit(Apple? apple, Banana? banana, string cultivar, decimal lengthCm, string origin, string color) { Apple = Apple; Banana = Banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -57,6 +63,24 @@ 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 /// @@ -72,6 +96,9 @@ 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(); } @@ -83,6 +110,20 @@ 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; } } @@ -115,6 +156,9 @@ 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()) @@ -132,6 +176,16 @@ 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; @@ -141,10 +195,19 @@ 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, color); + return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); } /// @@ -160,6 +223,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, gmFruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index fde1c82eb4c..38ce7666ae8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -33,27 +33,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal IsoscelesTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public IsoscelesTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Returns the string presentation of the object @@ -63,6 +65,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class IsoscelesTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -100,11 +104,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface? shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface? triangleInterface); + string? shapeType = default; + string? triangleType = default; while (utf8JsonReader.Read()) { @@ -121,19 +122,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class IsoscelesTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class IsoscelesTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class IsoscelesTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class IsoscelesTriangle."); - return new IsoscelesTriangle(shapeInterface, triangleInterface); + return new IsoscelesTriangle(shapeType, triangleType); } /// @@ -145,10 +152,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, IsoscelesTriangle isoscelesTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", isoscelesTriangle.ShapeType); + writer.WriteString("triangleType", isoscelesTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs index b04488e4d86..d5425246bc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs @@ -34,10 +34,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Whale whale) + public Mammal(Whale? whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Whale = whale; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -45,10 +53,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Zebra zebra) + public Mammal(Zebra? zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Zebra = zebra; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -56,15 +72,109 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Pig pig) + public Mammal(Pig? pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { 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 /// @@ -80,6 +190,24 @@ namespace Org.OpenAPITools.Model /// public Pig? Pig { get; set; } + /// + /// Gets or Sets ClassName + /// + [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 /// @@ -94,6 +222,10 @@ 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(); @@ -142,6 +274,11 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string? className = default; + bool? hasBaleen = default; + bool? hasTeeth = default; + Mammal.TypeEnum? type = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -157,23 +294,52 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + 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; } } } + 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); + return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra? zebra)) - return new Mammal(zebra); + return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig? pig)) - return new Mammal(pig); + return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); throw new JsonException(); } @@ -193,6 +359,19 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, mammal.Pig, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs index e3437fda649..0928ad4709e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs @@ -34,10 +34,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Triangle triangle) + public NullableShape(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -45,10 +51,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Quadrilateral quadrilateral) + public NullableShape(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -64,6 +76,24 @@ 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 /// @@ -78,6 +108,8 @@ 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"); return sb.ToString(); @@ -126,6 +158,10 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string? quadrilateralType = default; + string? shapeType = default; + string? triangleType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -141,19 +177,37 @@ 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); + return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new NullableShape(quadrilateral); + return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -171,6 +225,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, nullableShape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs index c5b4103b638..a5e763dbae9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs @@ -35,18 +35,18 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal OneOfString(string varString) + internal OneOfString(string? varString) { - String = varString; + VarString = varString; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string? String { get; set; } + public string? VarString { get; set; } /// /// Gets or Sets additional properties @@ -137,8 +137,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, OneOfString oneOfString, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.VarString, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs index 2492fffdc9e..0eb899e03fa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// /// petType [JsonConstructor] - internal ParentPet(string petType) : base(petType) + public ParentPet(string petType) : base(petType) { OnCreated(); } @@ -119,6 +119,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ParentPet parentPet, JsonSerializerOptions jsonSerializerOptions) { + writer.WriteStartObject(); + + writer.WriteString("pet_type", parentPet.PetType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs index 1b34e51a373..e7cae237e0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs @@ -34,10 +34,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(BasquePig basquePig) + public Pig(BasquePig? basquePig, string className) { BasquePig = basquePig; + ClassName = className; OnCreated(); } @@ -45,10 +47,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(DanishPig danishPig) + public Pig(DanishPig? danishPig, string className) { DanishPig = danishPig; + ClassName = className; OnCreated(); } @@ -64,6 +68,12 @@ namespace Org.OpenAPITools.Model /// public DanishPig? DanishPig { get; set; } + /// + /// Gets or Sets ClassName + /// + [JsonPropertyName("className")] + public string ClassName { get; set; } + /// /// Gets or Sets additional properties /// @@ -78,6 +88,7 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Pig {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -126,6 +137,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string? className = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -141,19 +154,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "className": + className = utf8JsonReader.GetString(); + break; default: break; } } } + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Pig."); + Utf8JsonReader basquePigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref basquePigReader, jsonSerializerOptions, out BasquePig? basquePig)) - return new Pig(basquePig); + return new Pig(basquePig, className); Utf8JsonReader danishPigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref danishPigReader, jsonSerializerOptions, out DanishPig? danishPig)) - return new Pig(danishPig); + return new Pig(danishPig, className); throw new JsonException(); } @@ -171,6 +190,11 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, pig.DanishPig, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("className", pig.ClassName); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index fc7e649d94d..0bbd66cb1d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -35,9 +35,9 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(bool varBool) + internal PolymorphicProperty(bool? varBool) { - Bool = varBool; + VarBool = varBool; OnCreated(); } @@ -46,9 +46,9 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(string varString) + internal PolymorphicProperty(string? varString) { - String = varString; + VarString = varString; OnCreated(); } @@ -57,44 +57,44 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(Object varObject) + internal PolymorphicProperty(Object? varObject) { - Object = varObject; + VarObject = varObject; OnCreated(); } /// /// Initializes a new instance of the class. /// - /// + /// [JsonConstructor] - internal PolymorphicProperty(List liststring) + internal PolymorphicProperty(List? list) { - Liststring = liststring; + List = list; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Bool + /// Gets or Sets VarBool /// - public bool? Bool { get; set; } + public bool? VarBool { get; set; } /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string? String { get; set; } + public string? VarString { get; set; } /// - /// Gets or Sets Object + /// Gets or Sets VarObject /// - public Object? Object { get; set; } + public Object? VarObject { get; set; } /// - /// Gets or Sets Liststring + /// Gets or Sets List /// - public List? Liststring { get; set; } + public List? List { get; set; } /// /// Gets or Sets additional properties @@ -181,9 +181,9 @@ namespace Org.OpenAPITools.Model if (Client.ClientUtils.TryDeserialize(ref varObjectReader, jsonSerializerOptions, out Object? varObject)) return new PolymorphicProperty(varObject); - Utf8JsonReader liststringReader = utf8JsonReader; - if (Client.ClientUtils.TryDeserialize>(ref liststringReader, jsonSerializerOptions, out List? liststring)) - return new PolymorphicProperty(liststring); + Utf8JsonReader listReader = utf8JsonReader; + if (Client.ClientUtils.TryDeserialize>(ref listReader, jsonSerializerOptions, out List? list)) + return new PolymorphicProperty(list); throw new JsonException(); } @@ -197,14 +197,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, PolymorphicProperty polymorphicProperty, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Bool, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarBool, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarString, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Object, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarObject, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Liststring, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.List, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs index 798f84e28e8..4b0d3dc86e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -34,10 +34,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(SimpleQuadrilateral simpleQuadrilateral) + public Quadrilateral(SimpleQuadrilateral? simpleQuadrilateral, string quadrilateralType, string shapeType) { SimpleQuadrilateral = simpleQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -45,10 +49,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(ComplexQuadrilateral complexQuadrilateral) + public Quadrilateral(ComplexQuadrilateral? complexQuadrilateral, string quadrilateralType, string shapeType) { ComplexQuadrilateral = complexQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -64,6 +72,18 @@ namespace Org.OpenAPITools.Model /// public ComplexQuadrilateral? ComplexQuadrilateral { 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 additional properties /// @@ -78,6 +98,8 @@ 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(); @@ -126,6 +148,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string? quadrilateralType = default; + string? shapeType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -141,19 +166,31 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } + 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); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral? complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral); + return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); throw new JsonException(); } @@ -171,6 +208,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); + writer.WriteString("shapeType", quadrilateral.ShapeType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 70a9c06187e..e82be6ff341 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -33,27 +33,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal ScaleneTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public ScaleneTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -69,6 +71,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ScaleneTriangle {\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"); return sb.ToString(); @@ -107,11 +111,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface? shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface? triangleInterface); + string? shapeType = default; + string? triangleType = default; while (utf8JsonReader.Read()) { @@ -128,19 +129,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ScaleneTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ScaleneTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class ScaleneTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class ScaleneTriangle."); - return new ScaleneTriangle(shapeInterface, triangleInterface); + return new ScaleneTriangle(shapeType, triangleType); } /// @@ -152,10 +159,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ScaleneTriangle scaleneTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", scaleneTriangle.ShapeType); + writer.WriteString("triangleType", scaleneTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index e1bce6c6984..a774449cdbb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -35,11 +35,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Triangle triangle, string quadrilateralType) + public Shape(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -48,11 +52,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Quadrilateral quadrilateral, string quadrilateralType) + public Shape(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -74,6 +82,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -89,6 +109,7 @@ 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"); return sb.ToString(); @@ -138,6 +159,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string? quadrilateralType = default; + string? shapeType = default; + string? triangleType = default; while (utf8JsonReader.Read()) { @@ -157,6 +180,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -166,13 +195,19 @@ namespace Org.OpenAPITools.Model 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); + return new Shape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new Shape(quadrilateral, quadrilateralType); + return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -190,6 +225,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index d6f4e96b1e4..d1fcd0ed701 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -35,11 +35,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle triangle, string quadrilateralType) + public ShapeOrNull(Triangle? triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -48,11 +52,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) + public ShapeOrNull(Quadrilateral? quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -74,6 +82,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -89,6 +109,7 @@ 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"); return sb.ToString(); @@ -138,6 +159,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string? quadrilateralType = default; + string? shapeType = default; + string? triangleType = default; while (utf8JsonReader.Read()) { @@ -157,6 +180,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -166,13 +195,19 @@ namespace Org.OpenAPITools.Model 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); + return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral? quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType); + return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -190,6 +225,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index fb6a1d0a0c5..bd700a30650 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -33,27 +33,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal SimpleQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public SimpleQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -69,6 +71,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class SimpleQuadrilateral {\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(); @@ -107,11 +111,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface? shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface? quadrilateralInterface); + string? quadrilateralType = default; + string? shapeType = default; while (utf8JsonReader.Read()) { @@ -128,19 +129,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class SimpleQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class SimpleQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class SimpleQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class SimpleQuadrilateral."); - return new SimpleQuadrilateral(shapeInterface, quadrilateralInterface); + return new SimpleQuadrilateral(quadrilateralType, shapeType); } /// @@ -152,10 +159,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, SimpleQuadrilateral simpleQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", simpleQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", simpleQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs index 6eac693d717..26b9f070674 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs @@ -37,7 +37,7 @@ namespace Org.OpenAPITools.Model /// shapeType /// triangleType [JsonConstructor] - public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) + public Triangle(EquilateralTriangle? equilateralTriangle, string shapeType, string triangleType) { EquilateralTriangle = equilateralTriangle; ShapeType = shapeType; @@ -52,7 +52,7 @@ namespace Org.OpenAPITools.Model /// shapeType /// triangleType [JsonConstructor] - public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) + public Triangle(IsoscelesTriangle? isoscelesTriangle, string shapeType, string triangleType) { IsoscelesTriangle = isoscelesTriangle; ShapeType = shapeType; @@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model /// shapeType /// triangleType [JsonConstructor] - public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) + public Triangle(ScaleneTriangle? scaleneTriangle, string shapeType, string triangleType) { ScaleneTriangle = scaleneTriangle; ShapeType = shapeType; @@ -234,6 +234,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, triangle.ScaleneTriangle, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("shapeType", triangle.ShapeType); + writer.WriteString("triangleType", triangle.TriangleType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES index d1fbcff0c4b..0ab733136b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES @@ -25,17 +25,14 @@ docs/models/BananaReq.md docs/models/BasquePig.md docs/models/Capitalization.md docs/models/Cat.md -docs/models/CatAllOf.md docs/models/Category.md docs/models/ChildCat.md -docs/models/ChildCatAllOf.md docs/models/ClassModel.md docs/models/ComplexQuadrilateral.md docs/models/DanishPig.md docs/models/DateOnlyClass.md docs/models/DeprecatedObject.md docs/models/Dog.md -docs/models/DogAllOf.md docs/models/Drawing.md docs/models/EnumArrays.md docs/models/EnumClass.md @@ -148,17 +145,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md index 16db4a55bd3..310a5e6575e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Declawed** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md index dae2ff76026..b8f7d81fbbe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md @@ -4,6 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] +**PetType** | **string** | | [optional] [default to PetTypeEnum.ChildCat] [[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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md index 0926bb55e71..fb00d4ebf08 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md index b1e39dcf07c..70cdc80e83e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Breed** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md index ddc9885fe56..8360b5c16a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md index b3bee18f7ba..1a298dac767 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md index 38ab0c1a6ca..5217febc9b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md index 584c4fd323d..49b24074b79 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md index ed481ad1448..07c62ac9338 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md index 5546632e4d6..82a8ca6027b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md index 0caa1aa5b9d..948b6d047ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md @@ -5,6 +5,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md index 83e58b6098d..fd7bb9359ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md @@ -4,6 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**ClassName** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md index 4fd16b32ea5..d1c44507419 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md index a01c2edc068..d3f15354bcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md index 2ec279cef3c..e0225d8dd49 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md @@ -5,6 +5,7 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md index 056fcbfdbdd..3f11685aced 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md @@ -6,6 +6,7 @@ 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-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md index 3bc21009b7e..a9c7f93b67a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs index fbb05465b35..a5d4bf43bbf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Cat //Assert.IsType(instance); } + + /// + /// Test the property 'Declawed' + /// + [Fact] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index 1ff1a3861e0..2c02364a9f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ChildCat //Assert.IsType(instance); } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + /// + /// Test the property 'PetType' + /// + [Fact] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 035955566f1..a7a864154ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ComplexQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs index e0dd382307d..b8e8bca0538 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Dog //Assert.IsType(instance); } + + /// + /// Test the property 'Breed' + /// + [Fact] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 393672d3f1a..f8d3daec3fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" EquilateralTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index a33c55ae487..504e060f55c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" FruitReq //Assert.IsType(instance); } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Mealy' + /// + [Fact] + public void MealyTest() + { + // TODO unit test for the property 'Mealy' + } + + /// + /// Test the property 'Sweet' + /// + [Fact] + public void SweetTest() + { + // TODO unit test for the property 'Sweet' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 46448efc62f..3bf452bddcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 7e79cd06792..5473b8bbaf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index df5fed5444a..464750233cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" IsoscelesTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs index c35e65e9dd3..e1779a30d0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Mammal //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + + /// + /// Test the property 'HasBaleen' + /// + [Fact] + public void HasBaleenTest() + { + // TODO unit test for the property 'HasBaleen' + } + + /// + /// Test the property 'HasTeeth' + /// + [Fact] + public void HasTeethTest() + { + // TODO unit test for the property 'HasTeeth' + } + + /// + /// Test the property 'Type' + /// + [Fact] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index f7fbf947051..b2d5d209920 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" NullableShape //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0cea8ec786f..bd052bc705b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Pig //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index 61086c1d7b3..53484304010 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Quadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index 68693398f5c..085d3e550a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ScaleneTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index 695a7b13c13..c5d411e42d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index 097e541b3b0..a0da7d9d515 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 66a19a05af5..baa6e1e9f6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" SimpleQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 6083ce6a811..ae3183e9e73 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -128,8 +128,8 @@ namespace Org.OpenAPITools.Client return boolean ? "true" : "false"; - if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) - return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is ChildCat.PetTypeEnum childCatPetTypeEnum) + return ChildCat.PetTypeEnumToJsonValue(childCatPetTypeEnum); if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) @@ -146,6 +146,8 @@ 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 3c784bde17c..b0c50613552 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -55,17 +55,14 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new BasquePigJsonConverter()); _jsonOptions.Converters.Add(new CapitalizationJsonConverter()); _jsonOptions.Converters.Add(new CatJsonConverter()); - _jsonOptions.Converters.Add(new CatAllOfJsonConverter()); _jsonOptions.Converters.Add(new CategoryJsonConverter()); _jsonOptions.Converters.Add(new ChildCatJsonConverter()); - _jsonOptions.Converters.Add(new ChildCatAllOfJsonConverter()); _jsonOptions.Converters.Add(new ClassModelJsonConverter()); _jsonOptions.Converters.Add(new ComplexQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new DanishPigJsonConverter()); _jsonOptions.Converters.Add(new DateOnlyClassJsonConverter()); _jsonOptions.Converters.Add(new DeprecatedObjectJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter()); - _jsonOptions.Converters.Add(new DogAllOfJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumClassConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs index 2c139f5085b..001f338601a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs @@ -31,29 +31,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// /// className + /// declawed /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) + public Cat(string className, bool declawed, string color = @"red") : base(className, color) { - Dictionary = dictionary; - CatAllOf = catAllOf; + Declawed = declawed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Dictionary + /// Gets or Sets Declawed /// - public Dictionary Dictionary { get; set; } - - /// - /// Gets or Sets CatAllOf - /// - public CatAllOf CatAllOf { get; set; } + [JsonPropertyName("declawed")] + public bool Declawed { get; set; } /// /// Returns the string presentation of the object @@ -64,6 +58,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Cat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -91,13 +86,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dictionaryReader = utf8JsonReader; - bool dictionaryDeserialized = Client.ClientUtils.TryDeserialize>(ref utf8JsonReader, jsonSerializerOptions, out Dictionary dictionary); - - Utf8JsonReader catAllOfReader = utf8JsonReader; - bool catAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out CatAllOf catAllOf); - string className = default; + bool? declawed = default; string color = default; while (utf8JsonReader.Read()) @@ -118,6 +108,10 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; + case "declawed": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); + break; case "color": color = utf8JsonReader.GetString(); break; @@ -130,16 +124,13 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Cat."); + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class Cat."); + if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Cat."); - if (dictionary == null) - throw new ArgumentNullException(nameof(dictionary), "Property is required for class Cat."); - - if (catAllOf == null) - throw new ArgumentNullException(nameof(catAllOf), "Property is required for class Cat."); - - return new Cat(dictionary, catAllOf, className, color); + return new Cat(className, declawed.Value, color); } /// @@ -151,10 +142,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Cat cat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, cat.Dictionary, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, cat.CatAllOf, jsonSerializerOptions); + writer.WriteString("className", cat.ClassName); + writer.WriteBoolean("declawed", cat.Declawed); + writer.WriteString("color", cat.Color); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs index c8f15bdebde..5e6d016c0a6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs @@ -31,21 +31,81 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// petType + /// name + /// petType (default to PetTypeEnum.ChildCat) [JsonConstructor] - internal ChildCat(ChildCatAllOf childCatAllOf, string petType) : base(petType) + public ChildCat(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) : base(ChildCat.PetTypeEnumToJsonValue(petType)) { - ChildCatAllOf = childCatAllOf; + Name = name; + PetType = petType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ChildCatAllOf + /// Defines PetType /// - public ChildCatAllOf ChildCatAllOf { get; set; } + public enum PetTypeEnum + { + /// + /// Enum ChildCat for value: ChildCat + /// + ChildCat = 1 + } + + /// + /// Returns a + /// + /// + /// + /// + public static PetTypeEnum PetTypeEnumFromString(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + throw new NotImplementedException($"Could not convert value to type PetTypeEnum: '{value}'"); + } + + /// + /// Returns a + /// + /// + /// + public static PetTypeEnum? PetTypeEnumFromStringOrDefault(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string PetTypeEnumToJsonValue(PetTypeEnum value) + { + if (value == PetTypeEnum.ChildCat) + return "ChildCat"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + + /// + /// Gets or Sets PetType + /// + [JsonPropertyName("pet_type")] + public new PetTypeEnum PetType { get; set; } + + /// + /// Gets or Sets Name + /// + [JsonPropertyName("name")] + public string Name { get; set; } /// /// Returns the string presentation of the object @@ -56,6 +116,8 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class ChildCat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -83,10 +145,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader childCatAllOfReader = utf8JsonReader; - bool childCatAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ChildCatAllOf childCatAllOf); - - string petType = default; + string name = default; + ChildCat.PetTypeEnum? petType = default; while (utf8JsonReader.Read()) { @@ -103,8 +163,14 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "name": + name = utf8JsonReader.GetString(); + break; case "pet_type": - petType = utf8JsonReader.GetString(); + string petTypeRawValue = utf8JsonReader.GetString(); + petType = petTypeRawValue == null + ? null + : ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); break; default: break; @@ -112,13 +178,13 @@ namespace Org.OpenAPITools.Model } } + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCat."); + if (petType == null) throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCat."); - if (childCatAllOf == null) - throw new ArgumentNullException(nameof(childCatAllOf), "Property is required for class ChildCat."); - - return new ChildCat(childCatAllOf, petType); + return new ChildCat(name, petType.Value); } /// @@ -130,8 +196,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ChildCat childCat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, childCat.ChildCatAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("name", childCat.Name); + + var petTypeRawValue = ChildCat.PetTypeEnumToJsonValue(childCat.PetType); + if (petTypeRawValue != null) + writer.WriteString("pet_type", petTypeRawValue); + else + writer.WriteNull("pet_type"); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 73b17711144..b5d3f62dc51 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal ComplexQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public ComplexQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ComplexQuadrilateral {\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(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface quadrilateralInterface); + string quadrilateralType = default; + string shapeType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ComplexQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ComplexQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class ComplexQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ComplexQuadrilateral."); - return new ComplexQuadrilateral(shapeInterface, quadrilateralInterface); + return new ComplexQuadrilateral(quadrilateralType, shapeType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ComplexQuadrilateral complexQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", complexQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", complexQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs index 7887c67e80c..935aa7f94b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs @@ -31,22 +31,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// breed /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) + public Dog(string breed, string className, string color = @"red") : base(className, color) { - DogAllOf = dogAllOf; + Breed = breed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets DogAllOf + /// Gets or Sets Breed /// - public DogAllOf DogAllOf { get; set; } + [JsonPropertyName("breed")] + public string Breed { get; set; } /// /// Returns the string presentation of the object @@ -57,6 +58,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Dog {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -84,9 +86,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dogAllOfReader = utf8JsonReader; - bool dogAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out DogAllOf dogAllOf); - + string breed = default; string className = default; string color = default; @@ -105,6 +105,9 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "breed": + breed = utf8JsonReader.GetString(); + break; case "className": className = utf8JsonReader.GetString(); break; @@ -117,16 +120,16 @@ namespace Org.OpenAPITools.Model } } + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class Dog."); + if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Dog."); if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Dog."); - if (dogAllOf == null) - throw new ArgumentNullException(nameof(dogAllOf), "Property is required for class Dog."); - - return new Dog(dogAllOf, className, color); + return new Dog(breed, className, color); } /// @@ -138,8 +141,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Dog dog, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, dog.DogAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("breed", dog.Breed); + writer.WriteString("className", dog.ClassName); + writer.WriteString("color", dog.Color); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index e363ac00b21..11e32b25158 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal EquilateralTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public EquilateralTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class EquilateralTriangle {\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"); return sb.ToString(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class EquilateralTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class EquilateralTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class EquilateralTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class EquilateralTriangle."); - return new EquilateralTriangle(shapeInterface, triangleInterface); + return new EquilateralTriangle(shapeType, triangleType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, EquilateralTriangle equilateralTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", equilateralTriangle.ShapeType); + writer.WriteString("triangleType", equilateralTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs index 258590cbd38..d200c36dc8d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -32,11 +32,17 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Apple apple, string color) + public Fruit(Apple apple, string cultivar, decimal lengthCm, string origin, string color) { Apple = apple; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -45,11 +51,17 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Banana banana, string color) + public Fruit(Banana banana, string cultivar, decimal lengthCm, string origin, string color) { Banana = banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -66,6 +78,24 @@ 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 /// @@ -81,6 +111,9 @@ 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(); } @@ -92,6 +125,20 @@ 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; } } @@ -118,6 +165,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string cultivar = default; + decimal? lengthCm = default; + string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -135,6 +185,16 @@ 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; @@ -144,16 +204,25 @@ 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, color); + return new Fruit(apple, cultivar, lengthCm.Value, origin, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana)) - return new Fruit(banana, color); + return new Fruit(banana, cultivar, lengthCm.Value, origin, color); throw new JsonException(); } @@ -171,6 +240,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs index 2420ddc3a0e..7a60bbba353 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -32,10 +32,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(AppleReq appleReq) + public FruitReq(AppleReq appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { AppleReq = appleReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -43,10 +51,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(BananaReq bananaReq) + public FruitReq(BananaReq bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { BananaReq = bananaReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -62,6 +78,30 @@ 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 /// @@ -70,6 +110,10 @@ 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(); } @@ -107,6 +151,11 @@ 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) @@ -122,19 +171,46 @@ 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); + return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq bananaReq)) - return new FruitReq(bananaReq); + return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); throw new JsonException(); } @@ -152,6 +228,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruitReq.BananaReq, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs index 33124605200..24e2c54d76b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -33,12 +33,18 @@ namespace Org.OpenAPITools.Model /// /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public GmFruit(Apple apple, Banana banana, string color) + public GmFruit(Apple apple, Banana banana, string cultivar, decimal lengthCm, string origin, string color) { Apple = Apple; Banana = Banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -55,6 +61,24 @@ 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 /// @@ -70,6 +94,9 @@ 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(); } @@ -81,6 +108,20 @@ 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; } } @@ -113,6 +154,9 @@ 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()) @@ -130,6 +174,16 @@ 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; @@ -139,10 +193,19 @@ 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, color); + return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); } /// @@ -158,6 +221,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, gmFruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 4b7c911e019..429d203b910 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal IsoscelesTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public IsoscelesTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Returns the string presentation of the object @@ -61,6 +63,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class IsoscelesTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -98,11 +102,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -119,19 +120,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class IsoscelesTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class IsoscelesTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class IsoscelesTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class IsoscelesTriangle."); - return new IsoscelesTriangle(shapeInterface, triangleInterface); + return new IsoscelesTriangle(shapeType, triangleType); } /// @@ -143,10 +150,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, IsoscelesTriangle isoscelesTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", isoscelesTriangle.ShapeType); + writer.WriteString("triangleType", isoscelesTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs index 10fc5342de3..ba88dea6be9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -32,10 +32,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Whale whale) + public Mammal(Whale whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Whale = whale; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -43,10 +51,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Zebra zebra) + public Mammal(Zebra zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Zebra = zebra; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -54,15 +70,109 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Pig pig) + public Mammal(Pig pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { 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 /// @@ -78,6 +188,24 @@ namespace Org.OpenAPITools.Model /// public Pig Pig { get; set; } + /// + /// Gets or Sets ClassName + /// + [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 /// @@ -92,6 +220,10 @@ 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(); @@ -140,6 +272,11 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string className = default; + bool? hasBaleen = default; + bool? hasTeeth = default; + Mammal.TypeEnum? type = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -155,23 +292,52 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + 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; } } } + 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); + return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra zebra)) - return new Mammal(zebra); + return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig pig)) - return new Mammal(pig); + return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); throw new JsonException(); } @@ -191,6 +357,19 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, mammal.Pig, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs index 115eeb8073b..31f6a6b909f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -32,10 +32,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Triangle triangle) + public NullableShape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -43,10 +49,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Quadrilateral quadrilateral) + public NullableShape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -62,6 +74,24 @@ 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 /// @@ -76,6 +106,8 @@ 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"); return sb.ToString(); @@ -124,6 +156,10 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string quadrilateralType = default; + string shapeType = default; + string triangleType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +175,37 @@ 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); + return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new NullableShape(quadrilateral); + return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -169,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, nullableShape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs index 07d244e7955..36a36022058 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs @@ -35,16 +35,16 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal OneOfString(string varString) { - String = varString; + VarString = varString; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string String { get; set; } + public string VarString { get; set; } /// /// Gets or Sets additional properties @@ -135,8 +135,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, OneOfString oneOfString, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.VarString, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs index 66192cfc94e..28ba2bac675 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// petType [JsonConstructor] - internal ParentPet(string petType) : base(petType) + public ParentPet(string petType) : base(petType) { OnCreated(); } @@ -117,6 +117,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ParentPet parentPet, JsonSerializerOptions jsonSerializerOptions) { + writer.WriteStartObject(); + + writer.WriteString("pet_type", parentPet.PetType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs index 970bca179ea..6fc382f7337 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs @@ -32,10 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(BasquePig basquePig) + public Pig(BasquePig basquePig, string className) { BasquePig = basquePig; + ClassName = className; OnCreated(); } @@ -43,10 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(DanishPig danishPig) + public Pig(DanishPig danishPig, string className) { DanishPig = danishPig; + ClassName = className; OnCreated(); } @@ -62,6 +66,12 @@ namespace Org.OpenAPITools.Model /// public DanishPig DanishPig { get; set; } + /// + /// Gets or Sets ClassName + /// + [JsonPropertyName("className")] + public string ClassName { get; set; } + /// /// Gets or Sets additional properties /// @@ -76,6 +86,7 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Pig {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -124,6 +135,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string className = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "className": + className = utf8JsonReader.GetString(); + break; default: break; } } } + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Pig."); + Utf8JsonReader basquePigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref basquePigReader, jsonSerializerOptions, out BasquePig basquePig)) - return new Pig(basquePig); + return new Pig(basquePig, className); Utf8JsonReader danishPigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref danishPigReader, jsonSerializerOptions, out DanishPig danishPig)) - return new Pig(danishPig); + return new Pig(danishPig, className); throw new JsonException(); } @@ -169,6 +188,11 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, pig.DanishPig, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("className", pig.ClassName); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index f4702676030..83a7c16ecc8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(bool varBool) { - Bool = varBool; + VarBool = varBool; OnCreated(); } @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(string varString) { - String = varString; + VarString = varString; OnCreated(); } @@ -57,42 +57,42 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(Object varObject) { - Object = varObject; + VarObject = varObject; OnCreated(); } /// /// Initializes a new instance of the class. /// - /// + /// [JsonConstructor] - internal PolymorphicProperty(List liststring) + internal PolymorphicProperty(List list) { - Liststring = liststring; + List = list; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Bool + /// Gets or Sets VarBool /// - public bool Bool { get; set; } + public bool VarBool { get; set; } /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string String { get; set; } + public string VarString { get; set; } /// - /// Gets or Sets Object + /// Gets or Sets VarObject /// - public Object Object { get; set; } + public Object VarObject { get; set; } /// - /// Gets or Sets Liststring + /// Gets or Sets List /// - public List Liststring { get; set; } + public List List { get; set; } /// /// Gets or Sets additional properties @@ -179,9 +179,9 @@ namespace Org.OpenAPITools.Model if (Client.ClientUtils.TryDeserialize(ref varObjectReader, jsonSerializerOptions, out Object varObject)) return new PolymorphicProperty(varObject); - Utf8JsonReader liststringReader = utf8JsonReader; - if (Client.ClientUtils.TryDeserialize>(ref liststringReader, jsonSerializerOptions, out List liststring)) - return new PolymorphicProperty(liststring); + Utf8JsonReader listReader = utf8JsonReader; + if (Client.ClientUtils.TryDeserialize>(ref listReader, jsonSerializerOptions, out List list)) + return new PolymorphicProperty(list); throw new JsonException(); } @@ -195,14 +195,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, PolymorphicProperty polymorphicProperty, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Bool, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarBool, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarString, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Object, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarObject, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Liststring, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.List, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index b1231ac5cb0..e6827767a2f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -32,10 +32,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(SimpleQuadrilateral simpleQuadrilateral) + public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType, string shapeType) { SimpleQuadrilateral = simpleQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -43,10 +47,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(ComplexQuadrilateral complexQuadrilateral) + public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType, string shapeType) { ComplexQuadrilateral = complexQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -62,6 +70,18 @@ namespace Org.OpenAPITools.Model /// public ComplexQuadrilateral ComplexQuadrilateral { 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 additional properties /// @@ -76,6 +96,8 @@ 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(); @@ -124,6 +146,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string quadrilateralType = default; + string shapeType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +164,31 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } + 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); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral); + return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); throw new JsonException(); } @@ -169,6 +206,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); + writer.WriteString("shapeType", quadrilateral.ShapeType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 437e782fb69..d04030be96c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal ScaleneTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public ScaleneTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ScaleneTriangle {\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"); return sb.ToString(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ScaleneTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ScaleneTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class ScaleneTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class ScaleneTriangle."); - return new ScaleneTriangle(shapeInterface, triangleInterface); + return new ScaleneTriangle(shapeType, triangleType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ScaleneTriangle scaleneTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", scaleneTriangle.ShapeType); + writer.WriteString("triangleType", scaleneTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs index db297074565..0183c25f725 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs @@ -33,11 +33,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Triangle triangle, string quadrilateralType) + public Shape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -46,11 +50,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Quadrilateral quadrilateral, string quadrilateralType) + public Shape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -72,6 +80,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -87,6 +107,7 @@ 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"); return sb.ToString(); @@ -136,6 +157,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -155,6 +178,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -164,13 +193,19 @@ namespace Org.OpenAPITools.Model 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); + return new Shape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new Shape(quadrilateral, quadrilateralType); + return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -188,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 117ba8baee4..478f16265d7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -33,11 +33,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle triangle, string quadrilateralType) + public ShapeOrNull(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -46,11 +50,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) + public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -72,6 +80,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -87,6 +107,7 @@ 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"); return sb.ToString(); @@ -136,6 +157,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -155,6 +178,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -164,13 +193,19 @@ namespace Org.OpenAPITools.Model 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); + return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType); + return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -188,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index aa71044dda5..21ca62304c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal SimpleQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public SimpleQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class SimpleQuadrilateral {\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(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface quadrilateralInterface); + string quadrilateralType = default; + string shapeType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class SimpleQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class SimpleQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class SimpleQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class SimpleQuadrilateral."); - return new SimpleQuadrilateral(shapeInterface, quadrilateralInterface); + return new SimpleQuadrilateral(quadrilateralType, shapeType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, SimpleQuadrilateral simpleQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", simpleQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", simpleQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs index ce77bd68dac..97cacac540f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -232,6 +232,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, triangle.ScaleneTriangle, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("shapeType", triangle.ShapeType); + writer.WriteString("triangleType", triangle.TriangleType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES index 16f489ff88b..2490e7ebb0b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES @@ -5,9 +5,7 @@ api/openapi.yaml appveyor.yml docs/apis/DefaultApi.md docs/models/Adult.md -docs/models/AdultAllOf.md docs/models/Child.md -docs/models/ChildAllOf.md docs/models/Person.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh @@ -34,9 +32,7 @@ src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs src/Org.OpenAPITools/Model/Adult.cs -src/Org.OpenAPITools/Model/AdultAllOf.cs src/Org.OpenAPITools/Model/Child.cs -src/Org.OpenAPITools/Model/ChildAllOf.cs src/Org.OpenAPITools/Model/Person.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml index 9c001848c5e..a6144ccdba8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml @@ -49,29 +49,23 @@ components: Adult: allOf: - $ref: '#/components/schemas/Person' - - $ref: '#/components/schemas/Adult_allOf' + - properties: + children: + items: + $ref: '#/components/schemas/Child' + type: array + type: object description: A representation of an adult Child: allOf: - - $ref: '#/components/schemas/Child_allOf' + - properties: + age: + format: int32 + type: integer + type: object - $ref: '#/components/schemas/Person' description: A representation of a child properties: boosterSeat: type: boolean - Adult_allOf: - properties: - children: - items: - $ref: '#/components/schemas/Child' - type: array - type: object - example: null - Child_allOf: - properties: - age: - format: int32 - type: integer - type: object - example: null diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md index 5f24d78cdaf..4bf74e4efc9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **FirstName** | **string** | | [optional] **LastName** | **string** | | [optional] **Type** | **string** | | [optional] +**Children** | [**List<Child>**](Child.md) | | [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-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md index 4c453728b24..bb2a1e5a561 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **FirstName** | **string** | | [optional] **LastName** | **string** | | [optional] **Type** | **string** | | [optional] +**Age** | **int** | | [optional] **BoosterSeat** | **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-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs index e886448aff2..31079eac974 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Adult //Assert.IsType(instance); } + + /// + /// Test the property 'Children' + /// + [Fact] + public void ChildrenTest() + { + // TODO unit test for the property 'Children' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs index e8d108a5399..17720f6e735 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs @@ -53,6 +53,15 @@ namespace Org.OpenAPITools.Test.Model //Assert.IsType(instance); } + /// + /// Test the property 'Age' + /// + [Fact] + public void AgeTest() + { + // TODO unit test for the property 'Age' + } + /// /// Test the property 'BoosterSeat' /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 78e97d62fca..311bbf80c43 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -43,9 +43,7 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new DateTimeJsonConverter()); _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); - _jsonOptions.Converters.Add(new AdultAllOfJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); - _jsonOptions.Converters.Add(new ChildAllOfJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs index 55f40b6f043..95969d35355 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs @@ -33,23 +33,24 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// children /// firstName /// lastName /// type [JsonConstructor] - internal Adult(AdultAllOf adultAllOf, string firstName, string lastName, string type) : base(firstName, lastName, type) + public Adult(List children, string firstName, string lastName, string type) : base(firstName, lastName, type) { - AdultAllOf = adultAllOf; + Children = children; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets AdultAllOf + /// Gets or Sets Children /// - public AdultAllOf AdultAllOf { get; set; } + [JsonPropertyName("children")] + public List Children { get; set; } /// /// Returns the string presentation of the object @@ -60,6 +61,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Adult {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Children: ").Append(Children).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -87,9 +89,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader adultAllOfReader = utf8JsonReader; - bool adultAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out AdultAllOf? adultAllOf); - + List? children = default; string? firstName = default; string? lastName = default; string? type = default; @@ -109,6 +109,10 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "children": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + children = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + break; case "firstName": firstName = utf8JsonReader.GetString(); break; @@ -124,6 +128,9 @@ namespace Org.OpenAPITools.Model } } + if (children == null) + throw new ArgumentNullException(nameof(children), "Property is required for class Adult."); + if (firstName == null) throw new ArgumentNullException(nameof(firstName), "Property is required for class Adult."); @@ -133,10 +140,7 @@ namespace Org.OpenAPITools.Model if (type == null) throw new ArgumentNullException(nameof(type), "Property is required for class Adult."); - if (adultAllOf == null) - throw new ArgumentNullException(nameof(adultAllOf), "Property is required for class Adult."); - - return new Adult(adultAllOf, firstName, lastName, type); + return new Adult(children, firstName, lastName, type); } /// @@ -148,8 +152,15 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Adult adult, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, adult.AdultAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WritePropertyName("children"); + JsonSerializer.Serialize(writer, adult.Children, jsonSerializerOptions); + writer.WriteString("firstName", adult.FirstName); + writer.WriteString("lastName", adult.LastName); + writer.WriteString("$_type", adult.Type); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs index 72a93f46950..4897fbe888c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs @@ -33,15 +33,15 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// boosterSeat + /// age /// firstName /// lastName /// type + /// boosterSeat [JsonConstructor] - public Child(ChildAllOf childAllOf, bool boosterSeat, string firstName, string lastName, string type) : base(firstName, lastName, type) + public Child(int age, string firstName, string lastName, string type, bool boosterSeat) : base(firstName, lastName, type) { - ChildAllOf = childAllOf; + Age = age; BoosterSeat = boosterSeat; OnCreated(); } @@ -49,9 +49,10 @@ namespace Org.OpenAPITools.Model partial void OnCreated(); /// - /// Gets or Sets ChildAllOf + /// Gets or Sets Age /// - public ChildAllOf ChildAllOf { get; set; } + [JsonPropertyName("age")] + public int Age { get; set; } /// /// Gets or Sets BoosterSeat @@ -68,6 +69,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Child {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Age: ").Append(Age).Append("\n"); sb.Append(" BoosterSeat: ").Append(BoosterSeat).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -96,13 +98,11 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader childAllOfReader = utf8JsonReader; - bool childAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ChildAllOf? childAllOf); - - bool? boosterSeat = default; + int? age = default; string? firstName = default; string? lastName = default; string? type = default; + bool? boosterSeat = default; while (utf8JsonReader.Read()) { @@ -119,9 +119,9 @@ namespace Org.OpenAPITools.Model switch (propertyName) { - case "boosterSeat": + case "age": if (utf8JsonReader.TokenType != JsonTokenType.Null) - boosterSeat = utf8JsonReader.GetBoolean(); + age = utf8JsonReader.GetInt32(); break; case "firstName": firstName = utf8JsonReader.GetString(); @@ -132,14 +132,18 @@ namespace Org.OpenAPITools.Model case "$_type": type = utf8JsonReader.GetString(); break; + case "boosterSeat": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + boosterSeat = utf8JsonReader.GetBoolean(); + break; default: break; } } } - if (boosterSeat == null) - throw new ArgumentNullException(nameof(boosterSeat), "Property is required for class Child."); + if (age == null) + throw new ArgumentNullException(nameof(age), "Property is required for class Child."); if (firstName == null) throw new ArgumentNullException(nameof(firstName), "Property is required for class Child."); @@ -150,10 +154,10 @@ namespace Org.OpenAPITools.Model if (type == null) throw new ArgumentNullException(nameof(type), "Property is required for class Child."); - if (childAllOf == null) - throw new ArgumentNullException(nameof(childAllOf), "Property is required for class Child."); + if (boosterSeat == null) + throw new ArgumentNullException(nameof(boosterSeat), "Property is required for class Child."); - return new Child(childAllOf, boosterSeat.Value, firstName, lastName, type); + return new Child(age.Value, firstName, lastName, type, boosterSeat.Value); } /// @@ -165,8 +169,15 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Child child, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, child.ChildAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteNumber("age", child.Age); + writer.WriteString("firstName", child.FirstName); + writer.WriteString("lastName", child.LastName); + writer.WriteString("$_type", child.Type); + writer.WriteBoolean("boosterSeat", child.BoosterSeat); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md index b3bee18f7ba..9d9df53f4a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md @@ -5,6 +5,8 @@ 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-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs index a6607ae5d56..c68f2a249f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -61,5 +61,23 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Count' + /// + [Fact] + public void CountTest() + { + // TODO unit test for the property 'Count' + } + + /// + /// Test the property 'Kind' + /// + [Fact] + public void KindTest() + { + // TODO unit test for the property 'Kind' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs index 4fb4852755a..75d88f0a19f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -35,12 +35,16 @@ namespace Org.OpenAPITools.Model /// /// /// + /// count + /// kind /// color [JsonConstructor] - public Fruit(Apple apple, Banana banana, string color) + public Fruit(Apple? apple, Banana? banana, decimal count, string kind, string color) { Apple = Apple; Banana = Banana; + Count = count; + Kind = kind; Color = color; OnCreated(); } @@ -57,6 +61,18 @@ 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 /// @@ -78,6 +94,8 @@ 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(); @@ -122,6 +140,8 @@ 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()) @@ -139,6 +159,13 @@ 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; @@ -148,10 +175,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."); - return new Fruit(apple, banana, color); + return new Fruit(apple, banana, count.Value, kind, color); } /// @@ -167,6 +200,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md index b3bee18f7ba..9d9df53f4a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md @@ -5,6 +5,8 @@ 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-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs index a6607ae5d56..c68f2a249f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -61,5 +61,23 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Count' + /// + [Fact] + public void CountTest() + { + // TODO unit test for the property 'Count' + } + + /// + /// Test the property 'Kind' + /// + [Fact] + public void KindTest() + { + // TODO unit test for the property 'Kind' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs index 4ce56860ccc..78eea425673 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -34,11 +34,15 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// count + /// kind /// color [JsonConstructor] - public Fruit(Apple apple, string color) + public Fruit(Apple? apple, decimal count, string kind, string color) { Apple = apple; + Count = count; + Kind = kind; Color = color; OnCreated(); } @@ -47,11 +51,15 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// count + /// kind /// color [JsonConstructor] - public Fruit(Banana banana, string color) + public Fruit(Banana? banana, decimal count, string kind, string color) { Banana = banana; + Count = count; + Kind = kind; Color = color; OnCreated(); } @@ -68,6 +76,18 @@ 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 /// @@ -89,6 +109,8 @@ 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(); @@ -127,6 +149,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + decimal? count = default; + string? kind = default; string? color = default; while (utf8JsonReader.Read()) @@ -144,6 +168,13 @@ 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; @@ -153,16 +184,22 @@ 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, color); + return new Fruit(apple, count.Value, kind, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana? banana)) - return new Fruit(banana, color); + return new Fruit(banana, count.Value, kind, color); throw new JsonException(); } @@ -180,6 +217,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES index d1fbcff0c4b..0ab733136b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES @@ -25,17 +25,14 @@ docs/models/BananaReq.md docs/models/BasquePig.md docs/models/Capitalization.md docs/models/Cat.md -docs/models/CatAllOf.md docs/models/Category.md docs/models/ChildCat.md -docs/models/ChildCatAllOf.md docs/models/ClassModel.md docs/models/ComplexQuadrilateral.md docs/models/DanishPig.md docs/models/DateOnlyClass.md docs/models/DeprecatedObject.md docs/models/Dog.md -docs/models/DogAllOf.md docs/models/Drawing.md docs/models/EnumArrays.md docs/models/EnumClass.md @@ -148,17 +145,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md index 16db4a55bd3..310a5e6575e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Declawed** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md index dae2ff76026..b8f7d81fbbe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md @@ -4,6 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] +**PetType** | **string** | | [optional] [default to PetTypeEnum.ChildCat] [[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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md index 0926bb55e71..fb00d4ebf08 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md index b1e39dcf07c..70cdc80e83e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **ClassName** | **string** | | **Color** | **string** | | [optional] [default to "red"] +**Breed** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md index ddc9885fe56..8360b5c16a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md index b3bee18f7ba..1a298dac767 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md index 38ab0c1a6ca..5217febc9b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md index 584c4fd323d..49b24074b79 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md @@ -5,6 +5,9 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md index ed481ad1448..07c62ac9338 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md index 5546632e4d6..82a8ca6027b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md @@ -4,6 +4,10 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md index 0caa1aa5b9d..948b6d047ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md @@ -5,6 +5,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md index 83e58b6098d..fd7bb9359ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md @@ -4,6 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**ClassName** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md index 4fd16b32ea5..d1c44507419 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md index a01c2edc068..d3f15354bcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md index 2ec279cef3c..e0225d8dd49 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md @@ -5,6 +5,7 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md index 056fcbfdbdd..3f11685aced 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md @@ -6,6 +6,7 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md index 3bc21009b7e..a9c7f93b67a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md @@ -4,6 +4,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs index fbb05465b35..a5d4bf43bbf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Cat //Assert.IsType(instance); } + + /// + /// Test the property 'Declawed' + /// + [Fact] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index 1ff1a3861e0..2c02364a9f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ChildCat //Assert.IsType(instance); } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + /// + /// Test the property 'PetType' + /// + [Fact] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 035955566f1..a7a864154ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ComplexQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs index e0dd382307d..b8e8bca0538 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Dog //Assert.IsType(instance); } + + /// + /// Test the property 'Breed' + /// + [Fact] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 393672d3f1a..f8d3daec3fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" EquilateralTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index a33c55ae487..504e060f55c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" FruitReq //Assert.IsType(instance); } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Mealy' + /// + [Fact] + public void MealyTest() + { + // TODO unit test for the property 'Mealy' + } + + /// + /// Test the property 'Sweet' + /// + [Fact] + public void SweetTest() + { + // TODO unit test for the property 'Sweet' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 46448efc62f..3bf452bddcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 7e79cd06792..5473b8bbaf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -61,5 +61,32 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Color' } + + /// + /// Test the property 'Cultivar' + /// + [Fact] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + + /// + /// Test the property 'LengthCm' + /// + [Fact] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + + /// + /// Test the property 'Origin' + /// + [Fact] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index df5fed5444a..464750233cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" IsoscelesTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs index c35e65e9dd3..e1779a30d0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -52,5 +52,41 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Mammal //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + + /// + /// Test the property 'HasBaleen' + /// + [Fact] + public void HasBaleenTest() + { + // TODO unit test for the property 'HasBaleen' + } + + /// + /// Test the property 'HasTeeth' + /// + [Fact] + public void HasTeethTest() + { + // TODO unit test for the property 'HasTeeth' + } + + /// + /// Test the property 'Type' + /// + [Fact] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index f7fbf947051..b2d5d209920 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" NullableShape //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0cea8ec786f..bd052bc705b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -52,5 +52,14 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Pig //Assert.IsType(instance); } + + /// + /// Test the property 'ClassName' + /// + [Fact] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index 61086c1d7b3..53484304010 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" Quadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index 68693398f5c..085d3e550a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" ScaleneTriangle //Assert.IsType(instance); } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + + /// + /// Test the property 'TriangleType' + /// + [Fact] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index 695a7b13c13..c5d411e42d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index 097e541b3b0..a0da7d9d515 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -61,5 +61,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'QuadrilateralType' } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 66a19a05af5..baa6e1e9f6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -52,5 +52,23 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" SimpleQuadrilateral //Assert.IsType(instance); } + + /// + /// Test the property 'QuadrilateralType' + /// + [Fact] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + + /// + /// Test the property 'ShapeType' + /// + [Fact] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 2b5879e4be2..21d629b7106 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -128,8 +128,8 @@ namespace Org.OpenAPITools.Client return boolean ? "true" : "false"; - if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) - return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is ChildCat.PetTypeEnum childCatPetTypeEnum) + return ChildCat.PetTypeEnumToJsonValue(childCatPetTypeEnum); if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) @@ -146,6 +146,8 @@ 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 3c784bde17c..b0c50613552 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -55,17 +55,14 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new BasquePigJsonConverter()); _jsonOptions.Converters.Add(new CapitalizationJsonConverter()); _jsonOptions.Converters.Add(new CatJsonConverter()); - _jsonOptions.Converters.Add(new CatAllOfJsonConverter()); _jsonOptions.Converters.Add(new CategoryJsonConverter()); _jsonOptions.Converters.Add(new ChildCatJsonConverter()); - _jsonOptions.Converters.Add(new ChildCatAllOfJsonConverter()); _jsonOptions.Converters.Add(new ClassModelJsonConverter()); _jsonOptions.Converters.Add(new ComplexQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new DanishPigJsonConverter()); _jsonOptions.Converters.Add(new DateOnlyClassJsonConverter()); _jsonOptions.Converters.Add(new DeprecatedObjectJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter()); - _jsonOptions.Converters.Add(new DogAllOfJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumClassConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs index 2c139f5085b..001f338601a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs @@ -31,29 +31,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// /// className + /// declawed /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) + public Cat(string className, bool declawed, string color = @"red") : base(className, color) { - Dictionary = dictionary; - CatAllOf = catAllOf; + Declawed = declawed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Dictionary + /// Gets or Sets Declawed /// - public Dictionary Dictionary { get; set; } - - /// - /// Gets or Sets CatAllOf - /// - public CatAllOf CatAllOf { get; set; } + [JsonPropertyName("declawed")] + public bool Declawed { get; set; } /// /// Returns the string presentation of the object @@ -64,6 +58,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Cat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -91,13 +86,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dictionaryReader = utf8JsonReader; - bool dictionaryDeserialized = Client.ClientUtils.TryDeserialize>(ref utf8JsonReader, jsonSerializerOptions, out Dictionary dictionary); - - Utf8JsonReader catAllOfReader = utf8JsonReader; - bool catAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out CatAllOf catAllOf); - string className = default; + bool? declawed = default; string color = default; while (utf8JsonReader.Read()) @@ -118,6 +108,10 @@ namespace Org.OpenAPITools.Model case "className": className = utf8JsonReader.GetString(); break; + case "declawed": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); + break; case "color": color = utf8JsonReader.GetString(); break; @@ -130,16 +124,13 @@ namespace Org.OpenAPITools.Model if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Cat."); + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class Cat."); + if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Cat."); - if (dictionary == null) - throw new ArgumentNullException(nameof(dictionary), "Property is required for class Cat."); - - if (catAllOf == null) - throw new ArgumentNullException(nameof(catAllOf), "Property is required for class Cat."); - - return new Cat(dictionary, catAllOf, className, color); + return new Cat(className, declawed.Value, color); } /// @@ -151,10 +142,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Cat cat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, cat.Dictionary, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, cat.CatAllOf, jsonSerializerOptions); + writer.WriteString("className", cat.ClassName); + writer.WriteBoolean("declawed", cat.Declawed); + writer.WriteString("color", cat.Color); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs index c8f15bdebde..5e6d016c0a6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs @@ -31,21 +31,81 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// petType + /// name + /// petType (default to PetTypeEnum.ChildCat) [JsonConstructor] - internal ChildCat(ChildCatAllOf childCatAllOf, string petType) : base(petType) + public ChildCat(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) : base(ChildCat.PetTypeEnumToJsonValue(petType)) { - ChildCatAllOf = childCatAllOf; + Name = name; + PetType = petType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ChildCatAllOf + /// Defines PetType /// - public ChildCatAllOf ChildCatAllOf { get; set; } + public enum PetTypeEnum + { + /// + /// Enum ChildCat for value: ChildCat + /// + ChildCat = 1 + } + + /// + /// Returns a + /// + /// + /// + /// + public static PetTypeEnum PetTypeEnumFromString(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + throw new NotImplementedException($"Could not convert value to type PetTypeEnum: '{value}'"); + } + + /// + /// Returns a + /// + /// + /// + public static PetTypeEnum? PetTypeEnumFromStringOrDefault(string value) + { + if (value == "ChildCat") + return PetTypeEnum.ChildCat; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string PetTypeEnumToJsonValue(PetTypeEnum value) + { + if (value == PetTypeEnum.ChildCat) + return "ChildCat"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + + /// + /// Gets or Sets PetType + /// + [JsonPropertyName("pet_type")] + public new PetTypeEnum PetType { get; set; } + + /// + /// Gets or Sets Name + /// + [JsonPropertyName("name")] + public string Name { get; set; } /// /// Returns the string presentation of the object @@ -56,6 +116,8 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class ChildCat {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -83,10 +145,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader childCatAllOfReader = utf8JsonReader; - bool childCatAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ChildCatAllOf childCatAllOf); - - string petType = default; + string name = default; + ChildCat.PetTypeEnum? petType = default; while (utf8JsonReader.Read()) { @@ -103,8 +163,14 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "name": + name = utf8JsonReader.GetString(); + break; case "pet_type": - petType = utf8JsonReader.GetString(); + string petTypeRawValue = utf8JsonReader.GetString(); + petType = petTypeRawValue == null + ? null + : ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); break; default: break; @@ -112,13 +178,13 @@ namespace Org.OpenAPITools.Model } } + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCat."); + if (petType == null) throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCat."); - if (childCatAllOf == null) - throw new ArgumentNullException(nameof(childCatAllOf), "Property is required for class ChildCat."); - - return new ChildCat(childCatAllOf, petType); + return new ChildCat(name, petType.Value); } /// @@ -130,8 +196,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ChildCat childCat, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, childCat.ChildCatAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("name", childCat.Name); + + var petTypeRawValue = ChildCat.PetTypeEnumToJsonValue(childCat.PetType); + if (petTypeRawValue != null) + writer.WriteString("pet_type", petTypeRawValue); + else + writer.WriteNull("pet_type"); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 73b17711144..b5d3f62dc51 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal ComplexQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public ComplexQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ComplexQuadrilateral {\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(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface quadrilateralInterface); + string quadrilateralType = default; + string shapeType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ComplexQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ComplexQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class ComplexQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ComplexQuadrilateral."); - return new ComplexQuadrilateral(shapeInterface, quadrilateralInterface); + return new ComplexQuadrilateral(quadrilateralType, shapeType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ComplexQuadrilateral complexQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, complexQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", complexQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", complexQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs index 7887c67e80c..935aa7f94b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs @@ -31,22 +31,23 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// + /// breed /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) + public Dog(string breed, string className, string color = @"red") : base(className, color) { - DogAllOf = dogAllOf; + Breed = breed; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets DogAllOf + /// Gets or Sets Breed /// - public DogAllOf DogAllOf { get; set; } + [JsonPropertyName("breed")] + public string Breed { get; set; } /// /// Returns the string presentation of the object @@ -57,6 +58,7 @@ namespace Org.OpenAPITools.Model StringBuilder sb = new StringBuilder(); sb.Append("class Dog {\n"); sb.Append(" ").Append(base.ToString()?.Replace("\n", "\n ")).Append("\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -84,9 +86,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader dogAllOfReader = utf8JsonReader; - bool dogAllOfDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out DogAllOf dogAllOf); - + string breed = default; string className = default; string color = default; @@ -105,6 +105,9 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "breed": + breed = utf8JsonReader.GetString(); + break; case "className": className = utf8JsonReader.GetString(); break; @@ -117,16 +120,16 @@ namespace Org.OpenAPITools.Model } } + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class Dog."); + if (className == null) throw new ArgumentNullException(nameof(className), "Property is required for class Dog."); if (color == null) throw new ArgumentNullException(nameof(color), "Property is required for class Dog."); - if (dogAllOf == null) - throw new ArgumentNullException(nameof(dogAllOf), "Property is required for class Dog."); - - return new Dog(dogAllOf, className, color); + return new Dog(breed, className, color); } /// @@ -138,8 +141,13 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, Dog dog, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, dog.DogAllOf, jsonSerializerOptions); + writer.WriteStartObject(); + writer.WriteString("breed", dog.Breed); + writer.WriteString("className", dog.ClassName); + writer.WriteString("color", dog.Color); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index e363ac00b21..11e32b25158 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal EquilateralTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public EquilateralTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class EquilateralTriangle {\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"); return sb.ToString(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class EquilateralTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class EquilateralTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class EquilateralTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class EquilateralTriangle."); - return new EquilateralTriangle(shapeInterface, triangleInterface); + return new EquilateralTriangle(shapeType, triangleType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, EquilateralTriangle equilateralTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, equilateralTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", equilateralTriangle.ShapeType); + writer.WriteString("triangleType", equilateralTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs index 258590cbd38..d200c36dc8d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -32,11 +32,17 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Apple apple, string color) + public Fruit(Apple apple, string cultivar, decimal lengthCm, string origin, string color) { Apple = apple; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -45,11 +51,17 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public Fruit(Banana banana, string color) + public Fruit(Banana banana, string cultivar, decimal lengthCm, string origin, string color) { Banana = banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -66,6 +78,24 @@ 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 /// @@ -81,6 +111,9 @@ 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(); } @@ -92,6 +125,20 @@ 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; } } @@ -118,6 +165,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string cultivar = default; + decimal? lengthCm = default; + string origin = default; string color = default; while (utf8JsonReader.Read()) @@ -135,6 +185,16 @@ 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; @@ -144,16 +204,25 @@ 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, color); + return new Fruit(apple, cultivar, lengthCm.Value, origin, color); Utf8JsonReader bananaReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReader, jsonSerializerOptions, out Banana banana)) - return new Fruit(banana, color); + return new Fruit(banana, cultivar, lengthCm.Value, origin, color); throw new JsonException(); } @@ -171,6 +240,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs index 2420ddc3a0e..7a60bbba353 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -32,10 +32,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(AppleReq appleReq) + public FruitReq(AppleReq appleReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { AppleReq = appleReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -43,10 +51,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// cultivar + /// lengthCm + /// mealy + /// sweet [JsonConstructor] - internal FruitReq(BananaReq bananaReq) + public FruitReq(BananaReq bananaReq, string cultivar, decimal lengthCm, bool mealy, bool sweet) { BananaReq = bananaReq; + Cultivar = cultivar; + LengthCm = lengthCm; + Mealy = mealy; + Sweet = sweet; OnCreated(); } @@ -62,6 +78,30 @@ 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 /// @@ -70,6 +110,10 @@ 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(); } @@ -107,6 +151,11 @@ 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) @@ -122,19 +171,46 @@ 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); + return new FruitReq(appleReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); Utf8JsonReader bananaReqReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref bananaReqReader, jsonSerializerOptions, out BananaReq bananaReq)) - return new FruitReq(bananaReq); + return new FruitReq(bananaReq, cultivar, lengthCm.Value, mealy.Value, sweet.Value); throw new JsonException(); } @@ -152,6 +228,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, fruitReq.BananaReq, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs index 33124605200..24e2c54d76b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -33,12 +33,18 @@ namespace Org.OpenAPITools.Model /// /// /// + /// cultivar + /// lengthCm + /// origin /// color [JsonConstructor] - public GmFruit(Apple apple, Banana banana, string color) + public GmFruit(Apple apple, Banana banana, string cultivar, decimal lengthCm, string origin, string color) { Apple = Apple; Banana = Banana; + Cultivar = cultivar; + LengthCm = lengthCm; + Origin = origin; Color = color; OnCreated(); } @@ -55,6 +61,24 @@ 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 /// @@ -70,6 +94,9 @@ 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(); } @@ -81,6 +108,20 @@ 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; } } @@ -113,6 +154,9 @@ 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()) @@ -130,6 +174,16 @@ 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; @@ -139,10 +193,19 @@ 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, color); + return new GmFruit(apple, banana, cultivar, lengthCm.Value, origin, color); } /// @@ -158,6 +221,14 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, gmFruit.Banana, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 4b7c911e019..429d203b910 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal IsoscelesTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public IsoscelesTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Returns the string presentation of the object @@ -61,6 +63,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class IsoscelesTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -98,11 +102,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -119,19 +120,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class IsoscelesTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class IsoscelesTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class IsoscelesTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class IsoscelesTriangle."); - return new IsoscelesTriangle(shapeInterface, triangleInterface); + return new IsoscelesTriangle(shapeType, triangleType); } /// @@ -143,10 +150,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, IsoscelesTriangle isoscelesTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, isoscelesTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", isoscelesTriangle.ShapeType); + writer.WriteString("triangleType", isoscelesTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs index 10fc5342de3..ba88dea6be9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -32,10 +32,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Whale whale) + public Mammal(Whale whale, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Whale = whale; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -43,10 +51,18 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Zebra zebra) + public Mammal(Zebra zebra, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { Zebra = zebra; + ClassName = className; + HasBaleen = hasBaleen; + HasTeeth = hasTeeth; + Type = type; OnCreated(); } @@ -54,15 +70,109 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className + /// hasBaleen + /// hasTeeth + /// type [JsonConstructor] - internal Mammal(Pig pig) + public Mammal(Pig pig, string className, bool hasBaleen, bool hasTeeth, TypeEnum type) { 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 /// @@ -78,6 +188,24 @@ namespace Org.OpenAPITools.Model /// public Pig Pig { get; set; } + /// + /// Gets or Sets ClassName + /// + [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 /// @@ -92,6 +220,10 @@ 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(); @@ -140,6 +272,11 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string className = default; + bool? hasBaleen = default; + bool? hasTeeth = default; + Mammal.TypeEnum? type = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -155,23 +292,52 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + 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; } } } + 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); + return new Mammal(whale, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader zebraReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref zebraReader, jsonSerializerOptions, out Zebra zebra)) - return new Mammal(zebra); + return new Mammal(zebra, className, hasBaleen.Value, hasTeeth.Value, type.Value); Utf8JsonReader pigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref pigReader, jsonSerializerOptions, out Pig pig)) - return new Mammal(pig); + return new Mammal(pig, className, hasBaleen.Value, hasTeeth.Value, type.Value); throw new JsonException(); } @@ -191,6 +357,19 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, mammal.Pig, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs index 115eeb8073b..31f6a6b909f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -32,10 +32,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Triangle triangle) + public NullableShape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -43,10 +49,16 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - internal NullableShape(Quadrilateral quadrilateral) + public NullableShape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -62,6 +74,24 @@ 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 /// @@ -76,6 +106,8 @@ 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"); return sb.ToString(); @@ -124,6 +156,10 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string quadrilateralType = default; + string shapeType = default; + string triangleType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +175,37 @@ 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); + return new NullableShape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new NullableShape(quadrilateral); + return new NullableShape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -169,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, nullableShape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs index 07d244e7955..36a36022058 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs @@ -35,16 +35,16 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal OneOfString(string varString) { - String = varString; + VarString = varString; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string String { get; set; } + public string VarString { get; set; } /// /// Gets or Sets additional properties @@ -135,8 +135,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, OneOfString oneOfString, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, oneOfString.VarString, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs index 66192cfc94e..28ba2bac675 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// petType [JsonConstructor] - internal ParentPet(string petType) : base(petType) + public ParentPet(string petType) : base(petType) { OnCreated(); } @@ -117,6 +117,11 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ParentPet parentPet, JsonSerializerOptions jsonSerializerOptions) { + writer.WriteStartObject(); + + writer.WriteString("pet_type", parentPet.PetType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs index 970bca179ea..6fc382f7337 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs @@ -32,10 +32,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(BasquePig basquePig) + public Pig(BasquePig basquePig, string className) { BasquePig = basquePig; + ClassName = className; OnCreated(); } @@ -43,10 +45,12 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// className [JsonConstructor] - internal Pig(DanishPig danishPig) + public Pig(DanishPig danishPig, string className) { DanishPig = danishPig; + ClassName = className; OnCreated(); } @@ -62,6 +66,12 @@ namespace Org.OpenAPITools.Model /// public DanishPig DanishPig { get; set; } + /// + /// Gets or Sets ClassName + /// + [JsonPropertyName("className")] + public string ClassName { get; set; } + /// /// Gets or Sets additional properties /// @@ -76,6 +86,7 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class Pig {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -124,6 +135,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string className = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +152,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "className": + className = utf8JsonReader.GetString(); + break; default: break; } } } + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Pig."); + Utf8JsonReader basquePigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref basquePigReader, jsonSerializerOptions, out BasquePig basquePig)) - return new Pig(basquePig); + return new Pig(basquePig, className); Utf8JsonReader danishPigReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref danishPigReader, jsonSerializerOptions, out DanishPig danishPig)) - return new Pig(danishPig); + return new Pig(danishPig, className); throw new JsonException(); } @@ -169,6 +188,11 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, pig.DanishPig, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("className", pig.ClassName); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index f4702676030..83a7c16ecc8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(bool varBool) { - Bool = varBool; + VarBool = varBool; OnCreated(); } @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(string varString) { - String = varString; + VarString = varString; OnCreated(); } @@ -57,42 +57,42 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal PolymorphicProperty(Object varObject) { - Object = varObject; + VarObject = varObject; OnCreated(); } /// /// Initializes a new instance of the class. /// - /// + /// [JsonConstructor] - internal PolymorphicProperty(List liststring) + internal PolymorphicProperty(List list) { - Liststring = liststring; + List = list; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets Bool + /// Gets or Sets VarBool /// - public bool Bool { get; set; } + public bool VarBool { get; set; } /// - /// Gets or Sets String + /// Gets or Sets VarString /// - public string String { get; set; } + public string VarString { get; set; } /// - /// Gets or Sets Object + /// Gets or Sets VarObject /// - public Object Object { get; set; } + public Object VarObject { get; set; } /// - /// Gets or Sets Liststring + /// Gets or Sets List /// - public List Liststring { get; set; } + public List List { get; set; } /// /// Gets or Sets additional properties @@ -179,9 +179,9 @@ namespace Org.OpenAPITools.Model if (Client.ClientUtils.TryDeserialize(ref varObjectReader, jsonSerializerOptions, out Object varObject)) return new PolymorphicProperty(varObject); - Utf8JsonReader liststringReader = utf8JsonReader; - if (Client.ClientUtils.TryDeserialize>(ref liststringReader, jsonSerializerOptions, out List liststring)) - return new PolymorphicProperty(liststring); + Utf8JsonReader listReader = utf8JsonReader; + if (Client.ClientUtils.TryDeserialize>(ref listReader, jsonSerializerOptions, out List list)) + return new PolymorphicProperty(list); throw new JsonException(); } @@ -195,14 +195,17 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, PolymorphicProperty polymorphicProperty, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Bool, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarBool, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.String, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarString, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Object, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.VarObject, jsonSerializerOptions); - System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.Liststring, jsonSerializerOptions); + System.Text.Json.JsonSerializer.Serialize(writer, polymorphicProperty.List, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index b1231ac5cb0..e6827767a2f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -32,10 +32,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(SimpleQuadrilateral simpleQuadrilateral) + public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType, string shapeType) { SimpleQuadrilateral = simpleQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -43,10 +47,14 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal Quadrilateral(ComplexQuadrilateral complexQuadrilateral) + public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType, string shapeType) { ComplexQuadrilateral = complexQuadrilateral; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } @@ -62,6 +70,18 @@ namespace Org.OpenAPITools.Model /// public ComplexQuadrilateral ComplexQuadrilateral { 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 additional properties /// @@ -76,6 +96,8 @@ 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(); @@ -124,6 +146,9 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; + string quadrilateralType = default; + string shapeType = default; + while (utf8JsonReader.Read()) { if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) @@ -139,19 +164,31 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } + 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); + return new Quadrilateral(simpleQuadrilateral, quadrilateralType, shapeType); Utf8JsonReader complexQuadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref complexQuadrilateralReader, jsonSerializerOptions, out ComplexQuadrilateral complexQuadrilateral)) - return new Quadrilateral(complexQuadrilateral); + return new Quadrilateral(complexQuadrilateral, quadrilateralType, shapeType); throw new JsonException(); } @@ -169,6 +206,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("quadrilateralType", quadrilateral.QuadrilateralType); + writer.WriteString("shapeType", quadrilateral.ShapeType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 437e782fb69..d04030be96c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// shapeType + /// triangleType [JsonConstructor] - internal ScaleneTriangle(ShapeInterface shapeInterface, TriangleInterface triangleInterface) + public ScaleneTriangle(string shapeType, string triangleType) { - ShapeInterface = shapeInterface; - TriangleInterface = triangleInterface; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets ShapeType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// - /// Gets or Sets TriangleInterface + /// Gets or Sets TriangleType /// - public TriangleInterface TriangleInterface { get; set; } + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class ScaleneTriangle {\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"); return sb.ToString(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader triangleInterfaceReader = utf8JsonReader; - bool triangleInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out TriangleInterface triangleInterface); + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class ScaleneTriangle."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ScaleneTriangle."); - if (triangleInterface == null) - throw new ArgumentNullException(nameof(triangleInterface), "Property is required for class ScaleneTriangle."); + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class ScaleneTriangle."); - return new ScaleneTriangle(shapeInterface, triangleInterface); + return new ScaleneTriangle(shapeType, triangleType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, ScaleneTriangle scaleneTriangle, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, scaleneTriangle.TriangleInterface, jsonSerializerOptions); + writer.WriteString("shapeType", scaleneTriangle.ShapeType); + writer.WriteString("triangleType", scaleneTriangle.TriangleType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs index db297074565..0183c25f725 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs @@ -33,11 +33,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Triangle triangle, string quadrilateralType) + public Shape(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -46,11 +50,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public Shape(Quadrilateral quadrilateral, string quadrilateralType) + public Shape(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -72,6 +80,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -87,6 +107,7 @@ 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"); return sb.ToString(); @@ -136,6 +157,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -155,6 +178,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -164,13 +193,19 @@ namespace Org.OpenAPITools.Model 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); + return new Shape(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new Shape(quadrilateral, quadrilateralType); + return new Shape(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -188,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shape.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 117ba8baee4..478f16265d7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -33,11 +33,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Triangle triangle, string quadrilateralType) + public ShapeOrNull(Triangle triangle, string quadrilateralType, string shapeType, string triangleType) { Triangle = triangle; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -46,11 +50,15 @@ namespace Org.OpenAPITools.Model /// /// /// quadrilateralType + /// shapeType + /// triangleType [JsonConstructor] - public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) + public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType, string shapeType, string triangleType) { Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; + ShapeType = shapeType; + TriangleType = triangleType; OnCreated(); } @@ -72,6 +80,18 @@ 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 TriangleType + /// + [JsonPropertyName("triangleType")] + public string TriangleType { get; set; } + /// /// Gets or Sets additional properties /// @@ -87,6 +107,7 @@ 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"); return sb.ToString(); @@ -136,6 +157,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; string quadrilateralType = default; + string shapeType = default; + string triangleType = default; while (utf8JsonReader.Read()) { @@ -155,6 +178,12 @@ namespace Org.OpenAPITools.Model case "quadrilateralType": quadrilateralType = utf8JsonReader.GetString(); break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; + case "triangleType": + triangleType = utf8JsonReader.GetString(); + break; default: break; } @@ -164,13 +193,19 @@ namespace Org.OpenAPITools.Model 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); + return new ShapeOrNull(triangle, quadrilateralType, shapeType, triangleType); Utf8JsonReader quadrilateralReader = utf8JsonReader; if (Client.ClientUtils.TryDeserialize(ref quadrilateralReader, jsonSerializerOptions, out Quadrilateral quadrilateral)) - return new ShapeOrNull(quadrilateral, quadrilateralType); + return new ShapeOrNull(quadrilateral, quadrilateralType, shapeType, triangleType); throw new JsonException(); } @@ -188,6 +223,13 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + 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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index aa71044dda5..21ca62304c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -31,27 +31,29 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// - /// + /// quadrilateralType + /// shapeType [JsonConstructor] - internal SimpleQuadrilateral(ShapeInterface shapeInterface, QuadrilateralInterface quadrilateralInterface) + public SimpleQuadrilateral(string quadrilateralType, string shapeType) { - ShapeInterface = shapeInterface; - QuadrilateralInterface = quadrilateralInterface; + QuadrilateralType = quadrilateralType; + ShapeType = shapeType; OnCreated(); } partial void OnCreated(); /// - /// Gets or Sets ShapeInterface + /// Gets or Sets QuadrilateralType /// - public ShapeInterface ShapeInterface { get; set; } + [JsonPropertyName("quadrilateralType")] + public string QuadrilateralType { get; set; } /// - /// Gets or Sets QuadrilateralInterface + /// Gets or Sets ShapeType /// - public QuadrilateralInterface QuadrilateralInterface { get; set; } + [JsonPropertyName("shapeType")] + public string ShapeType { get; set; } /// /// Gets or Sets additional properties @@ -67,6 +69,8 @@ namespace Org.OpenAPITools.Model { StringBuilder sb = new StringBuilder(); sb.Append("class SimpleQuadrilateral {\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(); @@ -105,11 +109,8 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - Utf8JsonReader shapeInterfaceReader = utf8JsonReader; - bool shapeInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out ShapeInterface shapeInterface); - - Utf8JsonReader quadrilateralInterfaceReader = utf8JsonReader; - bool quadrilateralInterfaceDeserialized = Client.ClientUtils.TryDeserialize(ref utf8JsonReader, jsonSerializerOptions, out QuadrilateralInterface quadrilateralInterface); + string quadrilateralType = default; + string shapeType = default; while (utf8JsonReader.Read()) { @@ -126,19 +127,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { + case "quadrilateralType": + quadrilateralType = utf8JsonReader.GetString(); + break; + case "shapeType": + shapeType = utf8JsonReader.GetString(); + break; default: break; } } } - if (shapeInterface == null) - throw new ArgumentNullException(nameof(shapeInterface), "Property is required for class SimpleQuadrilateral."); + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class SimpleQuadrilateral."); - if (quadrilateralInterface == null) - throw new ArgumentNullException(nameof(quadrilateralInterface), "Property is required for class SimpleQuadrilateral."); + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class SimpleQuadrilateral."); - return new SimpleQuadrilateral(shapeInterface, quadrilateralInterface); + return new SimpleQuadrilateral(quadrilateralType, shapeType); } /// @@ -150,10 +157,12 @@ namespace Org.OpenAPITools.Model /// public override void Write(Utf8JsonWriter writer, SimpleQuadrilateral simpleQuadrilateral, JsonSerializerOptions jsonSerializerOptions) { - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.ShapeInterface, jsonSerializerOptions); + writer.WriteStartObject(); - System.Text.Json.JsonSerializer.Serialize(writer, simpleQuadrilateral.QuadrilateralInterface, jsonSerializerOptions); + writer.WriteString("quadrilateralType", simpleQuadrilateral.QuadrilateralType); + writer.WriteString("shapeType", simpleQuadrilateral.ShapeType); + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs index ce77bd68dac..97cacac540f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -232,6 +232,12 @@ namespace Org.OpenAPITools.Model System.Text.Json.JsonSerializer.Serialize(writer, triangle.ScaleneTriangle, jsonSerializerOptions); + writer.WriteStartObject(); + + writer.WriteString("shapeType", triangle.ShapeType); + writer.WriteString("triangleType", triangle.TriangleType); + + writer.WriteEndObject(); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES index ca215d49250..85b9e2c66da 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -139,17 +136,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md index aae6c0fa54b..dc375eca03e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md @@ -189,17 +189,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES index 53972796813..71c7c4d5427 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -142,17 +139,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md index 3db41e724cc..12727d91225 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md @@ -176,17 +176,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES index 53972796813..71c7c4d5427 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -142,17 +139,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md index 3db41e724cc..12727d91225 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md @@ -176,17 +176,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES index 53972796813..71c7c4d5427 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -142,17 +139,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md index 3db41e724cc..12727d91225 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md @@ -176,17 +176,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES index 3a1325c51b9..f43efca2b9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES @@ -17,10 +17,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -28,7 +26,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -138,17 +135,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md index 136078e81b5..c81080b8ac1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md @@ -150,17 +150,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](BasquePig.md) - [Model.Capitalization](Capitalization.md) - [Model.Cat](Cat.md) - - [Model.CatAllOf](CatAllOf.md) - [Model.Category](Category.md) - [Model.ChildCat](ChildCat.md) - - [Model.ChildCatAllOf](ChildCatAllOf.md) - [Model.ClassModel](ClassModel.md) - [Model.ComplexQuadrilateral](ComplexQuadrilateral.md) - [Model.DanishPig](DanishPig.md) - [Model.DateOnlyClass](DateOnlyClass.md) - [Model.DeprecatedObject](DeprecatedObject.md) - [Model.Dog](Dog.md) - - [Model.DogAllOf](DogAllOf.md) - [Model.Drawing](Drawing.md) - [Model.EnumArrays](EnumArrays.md) - [Model.EnumClass](EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES index 033abe3804a..d1ae5aa8d93 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -141,17 +138,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md index 98d5c519793..d63a03725fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md @@ -164,17 +164,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES index 033abe3804a..d1ae5aa8d93 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES @@ -19,10 +19,8 @@ docs/BananaReq.md docs/BasquePig.md docs/Capitalization.md docs/Cat.md -docs/CatAllOf.md docs/Category.md docs/ChildCat.md -docs/ChildCatAllOf.md docs/ClassModel.md docs/ComplexQuadrilateral.md docs/DanishPig.md @@ -30,7 +28,6 @@ docs/DateOnlyClass.md docs/DefaultApi.md docs/DeprecatedObject.md docs/Dog.md -docs/DogAllOf.md docs/Drawing.md docs/EnumArrays.md docs/EnumClass.md @@ -141,17 +138,14 @@ src/Org.OpenAPITools/Model/BananaReq.cs src/Org.OpenAPITools/Model/BasquePig.cs src/Org.OpenAPITools/Model/Capitalization.cs src/Org.OpenAPITools/Model/Cat.cs -src/Org.OpenAPITools/Model/CatAllOf.cs src/Org.OpenAPITools/Model/Category.cs src/Org.OpenAPITools/Model/ChildCat.cs -src/Org.OpenAPITools/Model/ChildCatAllOf.cs src/Org.OpenAPITools/Model/ClassModel.cs src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs src/Org.OpenAPITools/Model/DanishPig.cs src/Org.OpenAPITools/Model/DateOnlyClass.cs src/Org.OpenAPITools/Model/DeprecatedObject.cs src/Org.OpenAPITools/Model/Dog.cs -src/Org.OpenAPITools/Model/DogAllOf.cs src/Org.OpenAPITools/Model/Drawing.cs src/Org.OpenAPITools/Model/EnumArrays.cs src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md index 3db41e724cc..12727d91225 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md @@ -176,17 +176,14 @@ Class | Method | HTTP request | Description - [Model.BasquePig](docs/BasquePig.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) - - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ChildCat](docs/ChildCat.md) - - [Model.ChildCatAllOf](docs/ChildCatAllOf.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.ComplexQuadrilateral](docs/ComplexQuadrilateral.md) - [Model.DanishPig](docs/DanishPig.md) - [Model.DateOnlyClass](docs/DateOnlyClass.md) - [Model.DeprecatedObject](docs/DeprecatedObject.md) - [Model.Dog](docs/Dog.md) - - [Model.DogAllOf](docs/DogAllOf.md) - [Model.Drawing](docs/Drawing.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml index ba9171e6cbe..6be7f291ccc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml @@ -1393,12 +1393,18 @@ components: Dog: allOf: - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - properties: + breed: + type: string + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' - $ref: '#/components/schemas/Address' - - $ref: '#/components/schemas/Cat_allOf' + - properties: + declawed: + type: boolean + type: object Address: additionalProperties: type: integer @@ -2103,7 +2109,16 @@ components: ChildCat: allOf: - $ref: '#/components/schemas/ParentPet' - - $ref: '#/components/schemas/ChildCat_allOf' + - properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object ArrayOfEnums: items: $ref: '#/components/schemas/OuterEnum' @@ -2364,40 +2379,14 @@ components: required: - requiredFile type: object - getCountry_request_allOf: - properties: - country: - type: string - required: - - country - type: object getCountry_request: allOf: - - $ref: '#/components/schemas/getCountry_request_allOf' - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - ChildCat_allOf: - properties: - name: - type: string - pet_type: - default: ChildCat - enum: - - ChildCat - type: string - x-enum-as-string: true - type: object - example: null + - properties: + country: + type: string + required: + - country + type: object securitySchemes: petstore_auth: flows: