From da1187fc8d0c483e93fd645540a3f42d7babc603 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Mon, 18 Mar 2024 01:02:26 -0400 Subject: [PATCH] [csharp] Fixes incorrect property name (#18136) * moved camel case lambda * renamed camel case lambda * reverted unintended change * fixed wrong property names * restored accidental file deletion * build samples --- .../languages/AbstractCSharpCodegen.java | 38 ++-- .../templating/mustache/CamelCaseLambda.java | 51 +++++ .../mustache/EscapeKeywordLambda.java | 55 ++++++ .../DependencyInjectionTests.mustache | 16 +- .../generichost/JsonConverter.mustache | 28 +-- .../generichost/ModelSignature.mustache | 2 +- .../generichost/modelGeneric.mustache | 34 ++-- ...odels-for-testing-with-http-signature.yaml | 10 + .../docs/NumberPropertiesOnly.md | 4 +- .../Model/NumberPropertiesOnly.cs | 40 ++-- .../api/openapi.yaml | 10 + .../docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../docs/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 32 +-- .../Model/FooGetDefaultResponse.cs | 32 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 184 +++++++++--------- .../Model/Model200Response.cs | 32 +-- .../src/Org.OpenAPITools/Model/Return.cs | 117 ++++++++++- .../api/openapi.yaml | 10 + .../docs/models/ClassModel.md | 2 +- .../docs/models/FooGetDefaultResponse.md | 2 +- .../docs/models/FormatTest.md | 10 +- .../docs/models/Model200Response.md | 2 +- .../docs/models/Return.md | 3 + .../UseSourceGeneration/Model/ClassModel.cs | 24 +-- .../Model/FooGetDefaultResponse.cs | 24 +-- .../UseSourceGeneration/Model/FormatTest.cs | 128 ++++++------ .../src/UseSourceGeneration/Model/Mammal.cs | 10 +- .../Model/Model200Response.cs | 24 +-- .../Model/NullableShape.cs | 10 +- .../UseSourceGeneration/Model/OneOfString.cs | 3 - .../Model/PolymorphicProperty.cs | 14 +- .../Model/Quadrilateral.cs | 10 +- .../src/UseSourceGeneration/Model/Return.cs | 78 +++++++- .../src/UseSourceGeneration/Model/Shape.cs | 10 +- .../UseSourceGeneration/Model/ShapeOrNull.cs | 10 +- .../api/openapi.yaml | 10 + .../docs/models/ClassModel.md | 2 +- .../docs/models/FooGetDefaultResponse.md | 2 +- .../docs/models/FormatTest.md | 10 +- .../docs/models/Model200Response.md | 2 +- .../docs/models/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 24 +-- .../Model/FooGetDefaultResponse.cs | 24 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 128 ++++++------ .../src/Org.OpenAPITools/Model/Mammal.cs | 10 +- .../Model/Model200Response.cs | 24 +-- .../Org.OpenAPITools/Model/NullableShape.cs | 10 +- .../src/Org.OpenAPITools/Model/OneOfString.cs | 3 - .../Model/PolymorphicProperty.cs | 14 +- .../Org.OpenAPITools/Model/Quadrilateral.cs | 10 +- .../src/Org.OpenAPITools/Model/Return.cs | 78 +++++++- .../src/Org.OpenAPITools/Model/Shape.cs | 10 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 10 +- .../api/openapi.yaml | 10 + .../docs/models/ClassModel.md | 2 +- .../docs/models/FooGetDefaultResponse.md | 2 +- .../docs/models/FormatTest.md | 10 +- .../docs/models/Model200Response.md | 2 +- .../docs/models/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 24 +-- .../Model/FooGetDefaultResponse.cs | 24 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 128 ++++++------ .../src/Org.OpenAPITools/Model/Mammal.cs | 10 +- .../Model/Model200Response.cs | 24 +-- .../Org.OpenAPITools/Model/NullableShape.cs | 10 +- .../src/Org.OpenAPITools/Model/OneOfString.cs | 3 - .../Model/PolymorphicProperty.cs | 14 +- .../Org.OpenAPITools/Model/Quadrilateral.cs | 10 +- .../src/Org.OpenAPITools/Model/Return.cs | 78 +++++++- .../src/Org.OpenAPITools/Model/Shape.cs | 10 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 10 +- .../api/openapi.yaml | 10 + .../docs/models/ClassModel.md | 2 +- .../docs/models/FooGetDefaultResponse.md | 2 +- .../docs/models/FormatTest.md | 10 +- .../docs/models/Model200Response.md | 2 +- .../docs/models/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 24 +-- .../Model/FooGetDefaultResponse.cs | 24 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 128 ++++++------ .../src/Org.OpenAPITools/Model/Mammal.cs | 10 +- .../Model/Model200Response.cs | 24 +-- .../Org.OpenAPITools/Model/NullableShape.cs | 10 +- .../src/Org.OpenAPITools/Model/OneOfString.cs | 3 - .../Model/PolymorphicProperty.cs | 14 +- .../Org.OpenAPITools/Model/Quadrilateral.cs | 10 +- .../src/Org.OpenAPITools/Model/Return.cs | 78 +++++++- .../src/Org.OpenAPITools/Model/Shape.cs | 10 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 10 +- .../OpenAPIClient-httpclient/api/openapi.yaml | 10 + .../docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../OpenAPIClient-httpclient/docs/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../src/Org.OpenAPITools/Model/Return.cs | 59 +++++- .../OpenAPIClient-net47/docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../OpenAPIClient-net47/docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../OpenAPIClient-net48/docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../OpenAPIClient-net48/docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../OpenAPIClient-net5.0/docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../OpenAPIClient-net5.0/docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../api/openapi.yaml | 10 + .../docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../docs/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 18 +- .../Model/FooGetDefaultResponse.cs | 18 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 78 ++++---- .../Model/Model200Response.cs | 18 +- .../src/Org.OpenAPITools/Model/Return.cs | 71 ++++++- .../csharp/OpenAPIClient/docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../csharp/OpenAPIClient/docs/FormatTest.md | 10 +- .../OpenAPIClient/docs/Model200Response.md | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../csharp/OpenAPIClientCore/api/openapi.yaml | 10 + .../OpenAPIClientCore/docs/ClassModel.md | 2 +- .../docs/FooGetDefaultResponse.md | 2 +- .../OpenAPIClientCore/docs/FormatTest.md | 10 +- .../docs/Model200Response.md | 2 +- .../csharp/OpenAPIClientCore/docs/Return.md | 3 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 12 +- .../Model/FooGetDefaultResponse.cs | 12 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 88 ++++----- .../Model/Model200Response.cs | 12 +- .../src/Org.OpenAPITools/Model/Return.cs | 56 +++++- 158 files changed, 2108 insertions(+), 1305 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/EscapeKeywordLambda.java 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 84a89902fc50..d1b448a0d7b2 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 @@ -85,7 +85,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co protected String enumValueSuffix = "Enum"; protected String sourceFolder = "src"; - protected String invalidNamePrefix = "var"; + protected static final String invalidParameterNamePrefix = "var"; + protected static final String invalidPropertyNamePrefix = "Var"; protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.PascalCase; // TODO: Add option for test folder output location. Nice to allow e.g. ./test instead of ./src. @@ -461,7 +462,9 @@ protected ImmutableMap.Builder addMustacheLambdas() { .put("pasteOnce", new PasteLambda(copyLambda, true, true, true, true)) .put("pasteLine", new PasteLambda(copyLambda, true, true, false, false)) .put("uniqueLines", new UniqueLambda("\n", false)) - .put("unique", new UniqueLambda("\n", true)); + .put("unique", new UniqueLambda("\n", true)) + .put("camel_case", new CamelCaseLambda()) + .put("escape_reserved_word", new EscapeKeywordLambda((val) -> this.escapeKeyword(val))); } @Override @@ -664,18 +667,13 @@ protected void removePropertiesDeclaredInComposedTypes(Map ob } 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; + String name = escapeReservedWord(model, value); + + if (name.startsWith(AbstractCSharpCodegen.invalidParameterNamePrefix)) { + name = AbstractCSharpCodegen.invalidPropertyNamePrefix + name.substring(AbstractCSharpCodegen.invalidParameterNamePrefix.length()); } - return value; + return name; } private void patchPropertyVendorExtensions(CodegenProperty property) { @@ -700,7 +698,6 @@ protected void patchProperty(Map enumRefs, CodegenModel mo patchPropertyVendorExtensions(property); - String tmpPropertyName = escapeReservedWord(model, property.name); property.name = patchPropertyName(model, property.name); String[] nestedTypes = { "List", "Collection", "ICollection", "Dictionary" }; @@ -1308,23 +1305,24 @@ public String toParamName(String name) { public String escapeReservedWord(CodegenModel model, String name) { name = this.escapeReservedWord(name); - return name.equalsIgnoreCase(model.getClassname()) - ? this.invalidNamePrefix + camelize(name) + return name.equals(model.getClassname()) + ? AbstractCSharpCodegen.invalidParameterNamePrefix + camelize(name) : name; } @Override public String escapeReservedWord(String name) { - if (reservedWords().contains(name) || - reservedWords().contains(name.toLowerCase(Locale.ROOT)) || - reservedWords().contains(camelize(sanitizeName(name))) || - isReservedWord(name) || + if (isReservedWord(name) || name.matches("^\\d.*")) { - name = this.invalidNamePrefix + camelize(name); + name = AbstractCSharpCodegen.invalidParameterNamePrefix + camelize(name); } return name; } + public String escapeKeyword(String value) { + return isReservedWord(value) ? "@" + value : value; + } + /** * Return the example value of the property * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java new file mode 100644 index 000000000000..8caf84c5da6e --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java @@ -0,0 +1,51 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.openapitools.codegen.templating.mustache; + + import com.samskivert.mustache.Mustache; + import com.samskivert.mustache.Template; + import org.openapitools.codegen.utils.CamelizeOption; + + import java.io.IOException; + import java.io.Writer; + + import static org.openapitools.codegen.utils.StringUtils.camelize; + + /** + * Converts text in a fragment to camelCase. + * + * Register: + * 
+  * additionalProperties.put("camelcase", new CamelCaseLambda());
+  *
+ * + * Use: + * 
+  * {{#camelcase}}{{name}}{{/camelcase}}
+  *
+ */ + public class CamelCaseLambda implements Mustache.Lambda { + public CamelCaseLambda() { + } + + @Override + public void execute(Template.Fragment fragment, Writer writer) throws IOException { + String text = fragment.execute(); + text = camelize(text, CamelizeOption.LOWERCASE_FIRST_CHAR); + writer.write(text); + } + } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/EscapeKeywordLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/EscapeKeywordLambda.java new file mode 100644 index 000000000000..54ac7a896630 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/EscapeKeywordLambda.java @@ -0,0 +1,55 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * Copyright 2018 SmartBear Software + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.templating.mustache; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; + +import java.io.IOException; +import java.io.Writer; +import java.util.function.UnaryOperator; + +/** + * Converts text in a fragment to escape_keyword. + * + * Register: + * 
+ * additionalProperties.put("escape_keyword", new EscapeKeywordLambda((val) -> this.escapeKeyword(val))));
+ *
+ * + * Use: + * 
+ * {{#escape_keyword}}{{name}}{{/escape_keyword}}
+ *
+ */ +public class EscapeKeywordLambda implements Mustache.Lambda { + private UnaryOperator callback; + + public EscapeKeywordLambda(final UnaryOperator callback) { + this.callback = callback; + } + + @Override + public void execute(Template.Fragment fragment, Writer writer) throws IOException { + String text = fragment.execute(); + + text = this.callback.apply(text); + + writer.write(text); + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache index 9f7b2ea2b3ff..aadf2c7316ed 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache @@ -166,8 +166,8 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void ConfigureApiWithAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); - Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} + {{#apiInfo}}{{#apis}}var {{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}} = _hostUsingConfigureWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); + Assert.True({{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} } @@ -178,8 +178,8 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void ConfigureApiWithoutAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); - Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} + {{#apiInfo}}{{#apis}}var {{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}} = _hostUsingConfigureWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); + Assert.True({{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} } @@ -190,8 +190,8 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void AddApiWithAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); - Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} + {{#apiInfo}}{{#apis}}var {{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}} = _hostUsingAddWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); + Assert.True({{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} } @@ -202,8 +202,8 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void AddApiWithoutAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); - Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} + {{#apiInfo}}{{#apis}}var {{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}} = _hostUsingAddWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); + Assert.True({{#lambda.camel_case}}{{classname}}{{/lambda.camel_case}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} } diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index 11e14953ab0c..fc08f46dda9a 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -29,6 +29,7 @@ /// public override {{classname}} Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) { + {{#lambda.trimTrailingWithNewLine}} {{#lambda.trimLineBreaks}} int currentDepth = utf8JsonReader.CurrentDepth; @@ -291,22 +292,24 @@ {{^composedSchemas.oneOf}} {{^required}} {{#model.composedSchemas.anyOf}} - Option<{{baseType}}{{>NullConditionalProperty}}> {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}}ParsedValue = {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}} == null + Option<{{baseType}}{{>NullConditionalProperty}}> {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} == null ? default - : new Option<{{baseType}}{{>NullConditionalProperty}}>({{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}}); + : new Option<{{baseType}}{{>NullConditionalProperty}}>({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}); {{/model.composedSchemas.anyOf}} {{#-last}} {{/-last}} {{/required}} - return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}}ParsedValue{{#required}}.Value{{^isNullable}}{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}.Value{{nrt!}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}} {{/allVars}}{{/lambda.joinWithComma}}); + return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue{{#required}}.Value{{^isNullable}}{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}.Value{{nrt!}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}} {{/allVars}}{{/lambda.joinWithComma}}); {{/composedSchemas.oneOf}} {{^model.discriminator}} {{#composedSchemas}} {{#oneOf}} + {{^vendorExtensions.x-duplicated-data-type}} if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} != null) return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}ParsedValue{{/required}} {{/allVars}}{{/lambda.joinWithComma}}); + {{/vendorExtensions.x-duplicated-data-type}} {{#-last}} throw new JsonException(); {{/-last}} @@ -315,6 +318,7 @@ {{/model.discriminator}} {{/vendorExtensions.x-duplicated-data-type}} {{/lambda.trimLineBreaks}} + {{/lambda.trimTrailingWithNewLine}} } /// @@ -331,22 +335,24 @@ {{#model.discriminator}} {{#model.hasDiscriminatorWithNonEmptyMapping}} - {{#mappedModels}} - if ({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{model.classname}} != null) { - {{model.classname}}JsonConverter {{#lambda.camelcase_sanitize_param}}{{model.classname}}JsonConverter{{/lambda.camelcase_sanitize_param}} = ({{model.classname}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{model.classname}}.GetType())); - {{#lambda.camelcase_sanitize_param}}{{model.classname}}JsonConverter{{/lambda.camelcase_sanitize_param}}.WriteProperties(ref writer, {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{model.classname}}, jsonSerializerOptions); + {{#composedSchemas.oneOf}} + {{^vendorExtensions.x-duplicated-data-type}} + if ({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}} != null) { + {{baseType}}JsonConverter {{#lambda.camelcase_sanitize_param}}{{baseType}}JsonConverter{{/lambda.camelcase_sanitize_param}} = ({{baseType}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}.GetType())); + {{#lambda.camelcase_sanitize_param}}{{baseType}}JsonConverter{{/lambda.camelcase_sanitize_param}}.WriteProperties(ref writer, {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}, jsonSerializerOptions); } - {{/mappedModels}} + {{/vendorExtensions.x-duplicated-data-type}} + {{/composedSchemas.oneOf}} {{/model.hasDiscriminatorWithNonEmptyMapping}} {{/model.discriminator}} {{^model.discriminator}} {{#composedSchemas}} {{#anyOf}} - if ({{#lambda.joinWithAmpersand}}{{^required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{datatypeWithEnum}}Option.IsSet {{/required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{datatypeWithEnum}}{{^required}}Option.Value{{/required}} != null{{/lambda.joinWithAmpersand}}) + if ({{#lambda.joinWithAmpersand}}{{^required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.IsSet {{/required}}{{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}} != null{{/lambda.joinWithAmpersand}}) { - {{datatypeWithEnum}}JsonConverter {{datatypeWithEnum}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{datatypeWithEnum}}{{^required}}Option.Value{{/required}}.GetType())); - {{datatypeWithEnum}}JsonConverter.WriteProperties(ref writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{datatypeWithEnum}}{{^required}}Option.Value{{/required}}, jsonSerializerOptions); + {{datatypeWithEnum}}JsonConverter {{datatypeWithEnum}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}.GetType())); + {{datatypeWithEnum}}JsonConverter.WriteProperties(ref writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}, jsonSerializerOptions); } {{/anyOf}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache index 57cf80ae9df7..d16e13065f15 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache @@ -1 +1 @@ -{{#model.allVars}}{{^required}}Option<{{/required}}{{{datatypeWithEnum}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#defaultValue}} = {{^required}}default{{/required}}{{#required}}{{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{.}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/required}}{{/defaultValue}}{{^defaultValue}}{{#lambda.first}}{{#isNullable}} = default {{/isNullable}}{{^required}} = default {{/required}}{{/lambda.first}}{{/defaultValue}} {{/model.allVars}} \ No newline at end of file +{{#model.allVars}}{{^required}}Option<{{/required}}{{{datatypeWithEnum}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}{{#defaultValue}} = {{^required}}default{{/required}}{{#required}}{{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{.}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/required}}{{/defaultValue}}{{^defaultValue}}{{#lambda.first}}{{#isNullable}} = default {{/isNullable}}{{^required}} = default {{/required}}{{/lambda.first}}{{/defaultValue}} {{/model.allVars}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache index 2f6b2ea6975f..48e63ba8e59e 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache @@ -8,26 +8,26 @@ /// /// Initializes a new instance of the class. /// - /// + /// {{#composedSchemas.anyOf}} - /// + /// {{/composedSchemas.anyOf}} {{#allVars}} - /// {{description}}{{^description}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} + /// {{description}}{{^description}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} - {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} {{#model.composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{dataType}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_sanitize_param}}{{parent}}{{/lambda.camelcase_sanitize_param}}.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{#model.composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{dataType}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{baseType}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{parent}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { {{#composedSchemas.anyOf}} - {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}}; + {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/composedSchemas.anyOf}} - {{name}} = {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}}; + {{name}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{#allVars}} {{^isInherited}} - {{name}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}; + {{name}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/isInherited}} {{#isInherited}} {{#isNew}} - {{name}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}; + {{name}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/isNew}} {{/isInherited}} {{/allVars}} @@ -41,26 +41,26 @@ /// Initializes a new instance of the class. /// {{#composedSchemas.anyOf}} - /// + /// {{/composedSchemas.anyOf}} {{#allVars}} - /// {{description}}{{^description}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} + /// {{description}}{{^description}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} {{^composedSchemas.anyOf}} [JsonConstructor] {{/composedSchemas.anyOf}} - {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{name}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.camelcase_sanitize_param}}{{baseType}}{{/lambda.camelcase_sanitize_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{baseType}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { {{#composedSchemas.anyOf}} - {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}; + {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/composedSchemas.anyOf}} {{#allVars}} {{^isInherited}} - {{name}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}; + {{name}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/isInherited}} {{#isInherited}} {{#isNew}} - {{name}}{{^required}}Option{{/required}} = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}; + {{name}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; {{/isNew}} {{/isInherited}} {{/allVars}} @@ -118,11 +118,11 @@ /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public {{#isNew}}new {{/isNew}}Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}> {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}Option { get; {{^isReadOnly}}private set; {{/isReadOnly}}} + public {{#isNew}}new {{/isNew}}Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}> {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}Option { get; {{^isReadOnly}}private set; {{/isReadOnly}}} {{/required}} /// - /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}{{/description}} + /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{/description}} /// {{#description}} /// {{.}}{{/description}} {{#example}} @@ -131,7 +131,7 @@ {{#deprecated}} [Obsolete] {{/deprecated}} - public {{{datatypeWithEnum}}}{{#lambda.first}}{{#isNullable}}{{>NullConditionalProperty}} {{/isNullable}}{{^required}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{/required}}{{/lambda.first}} {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{#required}}{ get; {{^isReadOnly}}set; {{/isReadOnly}}}{{/required}}{{^required}}{ get { return this.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}Option; } {{^isReadOnly}}set { this.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}Option = new{{^net70OrLater}} Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}>{{/net70OrLater}}(value); } {{/isReadOnly}}}{{/required}} + public {{{datatypeWithEnum}}}{{#lambda.first}}{{#isNullable}}{{>NullConditionalProperty}} {{/isNullable}}{{^required}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{/required}}{{/lambda.first}} {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{#required}}{ get; {{^isReadOnly}}set; {{/isReadOnly}}}{{/required}}{{^required}}{ get { return this.{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}Option; } {{^isReadOnly}}set { this.{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}Option = new{{^net70OrLater}} Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}>{{/net70OrLater}}(value); } {{/isReadOnly}}}{{/required}} {{/vendorExtensions.x-duplicated-data-type}} {{/composedSchemas.anyOf}} diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index faf7b6230cce..2dfa05e16ade 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1555,6 +1555,16 @@ components: return: type: integer format: int32 + lock: + type: string + abstract: + type: string + nullable: true + unsafe: + type: string + required: + - lock + - abstract xml: name: Return Name: diff --git a/samples/client/echo_api/csharp-restsharp/docs/NumberPropertiesOnly.md b/samples/client/echo_api/csharp-restsharp/docs/NumberPropertiesOnly.md index 3235b4dd22bf..f9c523da92eb 100644 --- a/samples/client/echo_api/csharp-restsharp/docs/NumberPropertiesOnly.md +++ b/samples/client/echo_api/csharp-restsharp/docs/NumberPropertiesOnly.md @@ -5,8 +5,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Number** | **decimal** | | [optional] -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] +**Float** | **float** | | [optional] +**Double** | **double** | | [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/echo_api/csharp-restsharp/src/Org.OpenAPITools/Model/NumberPropertiesOnly.cs b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Model/NumberPropertiesOnly.cs index 1fc8b28202f9..d94555402d4d 100644 --- a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Model/NumberPropertiesOnly.cs +++ b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Model/NumberPropertiesOnly.cs @@ -41,8 +41,8 @@ public partial class NumberPropertiesOnly : IEquatable, IV public NumberPropertiesOnly(decimal number = default(decimal), float varFloat = default(float), double varDouble = default(double)) { this.Number = number; - this.VarFloat = varFloat; - this.VarDouble = varDouble; + this.Float = varFloat; + this.Double = varDouble; } /// @@ -52,16 +52,16 @@ public partial class NumberPropertiesOnly : IEquatable, IV public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// /// Returns the string presentation of the object @@ -72,8 +72,8 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class NumberPropertiesOnly {\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -114,12 +114,12 @@ public bool Equals(NumberPropertiesOnly input) this.Number.Equals(input.Number) ) && ( - this.VarFloat == input.VarFloat || - this.VarFloat.Equals(input.VarFloat) + this.Float == input.Float || + this.Float.Equals(input.Float) ) && ( - this.VarDouble == input.VarDouble || - this.VarDouble.Equals(input.VarDouble) + this.Double == input.Double || + this.Double.Equals(input.Double) ); } @@ -133,8 +133,8 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); return hashCode; } } @@ -146,16 +146,16 @@ public override int GetHashCode() /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { - // VarDouble (double) maximum - if (this.VarDouble > (double)50.2) + // Double (double) maximum + if (this.Double > (double)50.2) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 50.2.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 50.2.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)0.8) + // Double (double) minimum + if (this.Double < (double)0.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 0.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 0.8.", new [] { "Double" }); } yield break; diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md index 2d28c89fa309..c2144b5e3cf6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md index 052ac9190068..a10daf95cf1d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md @@ -6,6 +6,9 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **VarReturn** | **int** | | [optional] +**Lock** | **string** | | +**Abstract** | **string** | | +**Unsafe** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs index b7b439f9265a..81ab14092839 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,37 +38,37 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this._VarClass = varClass; - if (this.VarClass != null) + this._Class = varClass; + if (this.Class != null) { - this._flagVarClass = true; + this._flagClass = true; } this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass + public string Class { - get{ return _VarClass;} + get{ return _Class;} set { - _VarClass = value; - _flagVarClass = true; + _Class = value; + _flagClass = true; } } - private string _VarClass; - private bool _flagVarClass; + private string _Class; + private bool _flagClass; /// - /// Returns false as VarClass should not be serialized given that it's read-only. + /// Returns false as Class should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarClass() + public bool ShouldSerializeClass() { - return _flagVarClass; + return _flagClass; } /// /// Gets or Sets additional properties @@ -84,7 +84,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -128,9 +128,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index d18b8493f483..f5826e02c5d3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,37 +38,37 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this._VarString = varString; - if (this.VarString != null) + this._String = varString; + if (this.String != null) { - this._flagVarString = true; + this._flagString = true; } this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString + public Foo String { - get{ return _VarString;} + get{ return _String;} set { - _VarString = value; - _flagVarString = true; + _String = value; + _flagString = true; } } - private Foo _VarString; - private bool _flagVarString; + private Foo _String; + private bool _flagString; /// - /// Returns false as VarString should not be serialized given that it's read-only. + /// Returns false as String should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarString() + public bool ShouldSerializeString() { - return _flagVarString; + return _flagString; } /// /// Gets or Sets additional properties @@ -84,7 +84,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -128,9 +128,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs index 73785b74a8fe..11ec8be6fd3b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs @@ -70,7 +70,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this._VarByte = varByte; + this._Byte = varByte; this._Date = date; // to ensure "password" is required (not null) if (password == null) @@ -103,25 +103,25 @@ protected FormatTest() { this._flagUnsignedLong = true; } - this._VarFloat = varFloat; - if (this.VarFloat != null) + this._Float = varFloat; + if (this.Float != null) { - this._flagVarFloat = true; + this._flagFloat = true; } - this._VarDouble = varDouble; - if (this.VarDouble != null) + this._Double = varDouble; + if (this.Double != null) { - this._flagVarDouble = true; + this._flagDouble = true; } - this._VarDecimal = varDecimal; - if (this.VarDecimal != null) + this._Decimal = varDecimal; + if (this.Decimal != null) { - this._flagVarDecimal = true; + this._flagDecimal = true; } - this._VarString = varString; - if (this.VarString != null) + this._String = varString; + if (this.String != null) { - this._flagVarString = true; + this._flagString = true; } this._Binary = binary; if (this.Binary != null) @@ -301,124 +301,124 @@ public bool ShouldSerializeNumber() return _flagNumber; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat + public float Float { - get{ return _VarFloat;} + get{ return _Float;} set { - _VarFloat = value; - _flagVarFloat = true; + _Float = value; + _flagFloat = true; } } - private float _VarFloat; - private bool _flagVarFloat; + private float _Float; + private bool _flagFloat; /// - /// Returns false as VarFloat should not be serialized given that it's read-only. + /// Returns false as Float should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarFloat() + public bool ShouldSerializeFloat() { - return _flagVarFloat; + return _flagFloat; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble + public double Double { - get{ return _VarDouble;} + get{ return _Double;} set { - _VarDouble = value; - _flagVarDouble = true; + _Double = value; + _flagDouble = true; } } - private double _VarDouble; - private bool _flagVarDouble; + private double _Double; + private bool _flagDouble; /// - /// Returns false as VarDouble should not be serialized given that it's read-only. + /// Returns false as Double should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarDouble() + public bool ShouldSerializeDouble() { - return _flagVarDouble; + return _flagDouble; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal + public decimal Decimal { - get{ return _VarDecimal;} + get{ return _Decimal;} set { - _VarDecimal = value; - _flagVarDecimal = true; + _Decimal = value; + _flagDecimal = true; } } - private decimal _VarDecimal; - private bool _flagVarDecimal; + private decimal _Decimal; + private bool _flagDecimal; /// - /// Returns false as VarDecimal should not be serialized given that it's read-only. + /// Returns false as Decimal should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarDecimal() + public bool ShouldSerializeDecimal() { - return _flagVarDecimal; + return _flagDecimal; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString + public string String { - get{ return _VarString;} + get{ return _String;} set { - _VarString = value; - _flagVarString = true; + _String = value; + _flagString = true; } } - private string _VarString; - private bool _flagVarString; + private string _String; + private bool _flagString; /// - /// Returns false as VarString should not be serialized given that it's read-only. + /// Returns false as String should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarString() + public bool ShouldSerializeString() { - return _flagVarString; + return _flagString; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte + public byte[] Byte { - get{ return _VarByte;} + get{ return _Byte;} set { - _VarByte = value; - _flagVarByte = true; + _Byte = value; + _flagByte = true; } } - private byte[] _VarByte; - private bool _flagVarByte; + private byte[] _Byte; + private bool _flagByte; /// - /// Returns false as VarByte should not be serialized given that it's read-only. + /// Returns false as Byte should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarByte() + public bool ShouldSerializeByte() { - return _flagVarByte; + return _flagByte; } /// /// Gets or Sets Binary @@ -639,11 +639,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -701,16 +701,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -807,36 +807,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs index b051508fad3b..0d87a0e81102 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs @@ -44,10 +44,10 @@ public partial class Model200Response : IEquatable, IValidatab { this._flagName = true; } - this._VarClass = varClass; - if (this.VarClass != null) + this._Class = varClass; + if (this.Class != null) { - this._flagVarClass = true; + this._flagClass = true; } this.AdditionalProperties = new Dictionary(); } @@ -77,28 +77,28 @@ public bool ShouldSerializeName() return _flagName; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass + public string Class { - get{ return _VarClass;} + get{ return _Class;} set { - _VarClass = value; - _flagVarClass = true; + _Class = value; + _flagClass = true; } } - private string _VarClass; - private bool _flagVarClass; + private string _Class; + private bool _flagClass; /// - /// Returns false as VarClass should not be serialized given that it's read-only. + /// Returns false as Class should not be serialized given that it's read-only. /// /// false (boolean) - public bool ShouldSerializeVarClass() + public bool ShouldSerializeClass() { - return _flagVarClass; + return _flagClass; } /// /// Gets or Sets additional properties @@ -115,7 +115,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -160,9 +160,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs index 687c10af3ae3..b9d31ec4707c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs @@ -32,17 +32,45 @@ namespace Org.OpenAPITools.Model [DataContract(Name = "Return")] public partial class Return : IEquatable, IValidatableObject { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Return() + { + this.AdditionalProperties = new Dictionary(); + } /// /// Initializes a new instance of the class. /// /// varReturn. - public Return(int varReturn = default(int)) + /// varLock (required). + /// varAbstract (required). + /// varUnsafe. + public Return(int varReturn = default(int), string varLock = default(string), string varAbstract = default(string), string varUnsafe = default(string)) { + // to ensure "varLock" is required (not null) + if (varLock == null) + { + throw new ArgumentNullException("varLock is a required property for Return and cannot be null"); + } + this._Lock = varLock; + // to ensure "varAbstract" is required (not null) + if (varAbstract == null) + { + throw new ArgumentNullException("varAbstract is a required property for Return and cannot be null"); + } + this._Abstract = varAbstract; this._VarReturn = varReturn; if (this.VarReturn != null) { this._flagVarReturn = true; } + this._Unsafe = varUnsafe; + if (this.Unsafe != null) + { + this._flagUnsafe = true; + } this.AdditionalProperties = new Dictionary(); } @@ -71,6 +99,78 @@ public bool ShouldSerializeVarReturn() return _flagVarReturn; } /// + /// Gets or Sets Lock + /// + [DataMember(Name = "lock", IsRequired = true, EmitDefaultValue = true)] + public string Lock + { + get{ return _Lock;} + set + { + _Lock = value; + _flagLock = true; + } + } + private string _Lock; + private bool _flagLock; + + /// + /// Returns false as Lock should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeLock() + { + return _flagLock; + } + /// + /// Gets or Sets Abstract + /// + [DataMember(Name = "abstract", IsRequired = true, EmitDefaultValue = true)] + public string Abstract + { + get{ return _Abstract;} + set + { + _Abstract = value; + _flagAbstract = true; + } + } + private string _Abstract; + private bool _flagAbstract; + + /// + /// Returns false as Abstract should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeAbstract() + { + return _flagAbstract; + } + /// + /// Gets or Sets Unsafe + /// + [DataMember(Name = "unsafe", EmitDefaultValue = false)] + public string Unsafe + { + get{ return _Unsafe;} + set + { + _Unsafe = value; + _flagUnsafe = true; + } + } + private string _Unsafe; + private bool _flagUnsafe; + + /// + /// Returns false as Unsafe should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeUnsafe() + { + return _flagUnsafe; + } + /// /// Gets or Sets additional properties /// [JsonExtensionData] @@ -85,6 +185,9 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -129,6 +232,18 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.VarReturn.GetHashCode(); + if (this.Lock != null) + { + hashCode = (hashCode * 59) + this.Lock.GetHashCode(); + } + if (this.Abstract != null) + { + hashCode = (hashCode * 59) + this.Abstract.GetHashCode(); + } + if (this.Unsafe != null) + { + hashCode = (hashCode * 59) + this.Unsafe.GetHashCode(); + } if (this.AdditionalProperties != null) { hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md index 8f3f093f582a..6c91c17f3803 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md index 9beed4cd8428..164ea996a24c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md index 3540ad007d2a..df9fbb87f6e7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md @@ -4,22 +4,22 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarByte** | **byte[]** | | +**Byte** | **byte[]** | | **Date** | **DateOnly** | | **Number** | **decimal** | | **Password** | **string** | | **Binary** | **System.IO.Stream** | | [optional] **DateTime** | **DateTime** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarDouble** | **double** | | [optional] -**VarFloat** | **float** | | [optional] +**Decimal** | **decimal** | | [optional] +**Double** | **double** | | [optional] +**Float** | **float** | | [optional] **Int32** | **int** | | [optional] **Int64** | **long** | | [optional] **Integer** | **int** | | [optional] **PatternWithBackslash** | **string** | None | [optional] **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] -**VarString** | **string** | | [optional] +**String** | **string** | | [optional] **UnsignedInteger** | **uint** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md index 28ea5e591da5..7fec9514d2fb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md @@ -5,7 +5,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] **Name** | **int** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md index b96de8ee3712..8bea7e491d09 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md @@ -5,7 +5,10 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Lock** | **string** | | +**Abstract** | **string** | | **VarReturn** | **int** | | [optional] +**Unsafe** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs index 3577fc7c3ecd..66626eba59b1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs @@ -35,28 +35,28 @@ public partial class ClassModel : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class [JsonConstructor] - public ClassModel(Option varClass = default) + public ClassModel(Option @class = default) { - VarClassOption = varClass; + ClassOption = @class; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("_class")] - public string? VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string? Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Gets or Sets additional properties @@ -72,7 +72,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -167,11 +167,11 @@ public override void Write(Utf8JsonWriter writer, ClassModel classModel, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, ClassModel classModel, JsonSerializerOptions jsonSerializerOptions) { - if (classModel.VarClassOption.IsSet && classModel.VarClass == null) - throw new ArgumentNullException(nameof(classModel.VarClass), "Property is required for class ClassModel."); + if (classModel.ClassOption.IsSet && classModel.Class == null) + throw new ArgumentNullException(nameof(classModel.Class), "Property is required for class ClassModel."); - if (classModel.VarClassOption.IsSet) - writer.WriteString("_class", classModel.VarClass); + if (classModel.ClassOption.IsSet) + writer.WriteString("_class", classModel.Class); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs index 1bbe0ddf0fe8..695b83e8f059 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs @@ -35,28 +35,28 @@ public partial class FooGetDefaultResponse : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varString + /// string [JsonConstructor] - public FooGetDefaultResponse(Option varString = default) + public FooGetDefaultResponse(Option @string = default) { - VarStringOption = varString; + StringOption = @string; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public Foo? VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public Foo? String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Gets or Sets additional properties @@ -72,7 +72,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -168,13 +168,13 @@ public override void Write(Utf8JsonWriter writer, FooGetDefaultResponse fooGetDe /// public void WriteProperties(ref Utf8JsonWriter writer, FooGetDefaultResponse fooGetDefaultResponse, JsonSerializerOptions jsonSerializerOptions) { - if (fooGetDefaultResponse.VarStringOption.IsSet && fooGetDefaultResponse.VarString == null) - throw new ArgumentNullException(nameof(fooGetDefaultResponse.VarString), "Property is required for class FooGetDefaultResponse."); + if (fooGetDefaultResponse.StringOption.IsSet && fooGetDefaultResponse.String == null) + throw new ArgumentNullException(nameof(fooGetDefaultResponse.String), "Property is required for class FooGetDefaultResponse."); - if (fooGetDefaultResponse.VarStringOption.IsSet) + if (fooGetDefaultResponse.StringOption.IsSet) { writer.WritePropertyName("string"); - JsonSerializer.Serialize(writer, fooGetDefaultResponse.VarString, jsonSerializerOptions); + JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, jsonSerializerOptions); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs index 254504ca937c..0c252ce8e898 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs @@ -35,44 +35,44 @@ public partial class FormatTest : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varByte + /// byte /// date /// number /// password /// binary /// dateTime - /// varDecimal - /// varDouble - /// varFloat + /// decimal + /// double + /// float /// int32 /// int64 /// integer /// None /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. - /// varString + /// string /// unsignedInteger /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option varDecimal = default, Option varDouble = default, Option varFloat = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option varString = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) + public FormatTest(byte[] @byte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option @decimal = default, Option @double = default, Option @float = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option @string = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) { - VarByte = varByte; + Byte = @byte; Date = date; Number = number; Password = password; BinaryOption = binary; DateTimeOption = dateTime; - VarDecimalOption = varDecimal; - VarDoubleOption = varDouble; - VarFloatOption = varFloat; + DecimalOption = @decimal; + DoubleOption = @double; + FloatOption = @float; Int32Option = int32; Int64Option = int64; IntegerOption = integer; PatternWithBackslashOption = patternWithBackslash; PatternWithDigitsOption = patternWithDigits; PatternWithDigitsAndDelimiterOption = patternWithDigitsAndDelimiter; - VarStringOption = varString; + StringOption = @string; UnsignedIntegerOption = unsignedInteger; UnsignedLongOption = unsignedLong; UuidOption = uuid; @@ -82,10 +82,10 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password partial void OnCreated(); /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [JsonPropertyName("byte")] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Date @@ -134,43 +134,43 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public DateTime? DateTime { get { return this. DateTimeOption; } set { this.DateTimeOption = new(value); } } /// - /// Used to track the state of VarDecimal + /// Used to track the state of Decimal /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDecimalOption { get; private set; } + public Option DecimalOption { get; private set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [JsonPropertyName("decimal")] - public decimal? VarDecimal { get { return this. VarDecimalOption; } set { this.VarDecimalOption = new(value); } } + public decimal? Decimal { get { return this. DecimalOption; } set { this.DecimalOption = new(value); } } /// - /// Used to track the state of VarDouble + /// Used to track the state of Double /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDoubleOption { get; private set; } + public Option DoubleOption { get; private set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [JsonPropertyName("double")] - public double? VarDouble { get { return this. VarDoubleOption; } set { this.VarDoubleOption = new(value); } } + public double? Double { get { return this. DoubleOption; } set { this.DoubleOption = new(value); } } /// - /// Used to track the state of VarFloat + /// Used to track the state of Float /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarFloatOption { get; private set; } + public Option FloatOption { get; private set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [JsonPropertyName("float")] - public float? VarFloat { get { return this. VarFloatOption; } set { this.VarFloatOption = new(value); } } + public float? Float { get { return this. FloatOption; } set { this.FloatOption = new(value); } } /// /// Used to track the state of Int32 @@ -254,17 +254,17 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public string? PatternWithDigitsAndDelimiter { get { return this. PatternWithDigitsAndDelimiterOption; } set { this.PatternWithDigitsAndDelimiterOption = new(value); } } /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public string? VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public string? String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Used to track the state of UnsignedInteger @@ -320,22 +320,22 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FormatTest {\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Password: ").Append(Password).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" PatternWithBackslash: ").Append(PatternWithBackslash).Append("\n"); sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); @@ -375,28 +375,28 @@ public override string ToString() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - // VarDouble (double) maximum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value > (double)123.4) + // Double (double) maximum + if (this.DoubleOption.IsSet && this.DoubleOption.Value > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value < (double)67.8) + // Double (double) minimum + if (this.DoubleOption.IsSet && this.DoubleOption.Value < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - // VarFloat (float) maximum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value > (float)987.6) + // Float (float) maximum + if (this.FloatOption.IsSet && this.FloatOption.Value > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value < (float)54.3) + // Float (float) minimum + if (this.FloatOption.IsSet && this.FloatOption.Value < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } // Int32 (int) maximum @@ -453,13 +453,13 @@ public override string ToString() } } - if (this.VarStringOption.Value != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (this.StringOption.Value != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (this.VarStringOption.Value != null &&!regexVarString.Match(this.VarStringOption.Value).Success) + if (this.StringOption.Value != null &&!regexString.Match(this.StringOption.Value).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } @@ -719,8 +719,8 @@ public override void Write(Utf8JsonWriter writer, FormatTest formatTest, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, JsonSerializerOptions jsonSerializerOptions) { - if (formatTest.VarByte == null) - throw new ArgumentNullException(nameof(formatTest.VarByte), "Property is required for class FormatTest."); + if (formatTest.Byte == null) + throw new ArgumentNullException(nameof(formatTest.Byte), "Property is required for class FormatTest."); if (formatTest.Password == null) throw new ArgumentNullException(nameof(formatTest.Password), "Property is required for class FormatTest."); @@ -737,11 +737,11 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet && formatTest.PatternWithDigitsAndDelimiter == null) throw new ArgumentNullException(nameof(formatTest.PatternWithDigitsAndDelimiter), "Property is required for class FormatTest."); - if (formatTest.VarStringOption.IsSet && formatTest.VarString == null) - throw new ArgumentNullException(nameof(formatTest.VarString), "Property is required for class FormatTest."); + if (formatTest.StringOption.IsSet && formatTest.String == null) + throw new ArgumentNullException(nameof(formatTest.String), "Property is required for class FormatTest."); writer.WritePropertyName("byte"); - JsonSerializer.Serialize(writer, formatTest.VarByte, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Byte, jsonSerializerOptions); writer.WriteString("date", formatTest.Date.ToString(DateFormat)); writer.WriteNumber("number", formatTest.Number); @@ -756,16 +756,16 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.DateTimeOption.IsSet) writer.WriteString("dateTime", formatTest.DateTimeOption.Value!.Value.ToString(DateTimeFormat)); - if (formatTest.VarDecimalOption.IsSet) + if (formatTest.DecimalOption.IsSet) { writer.WritePropertyName("decimal"); - JsonSerializer.Serialize(writer, formatTest.VarDecimal, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Decimal, jsonSerializerOptions); } - if (formatTest.VarDoubleOption.IsSet) - writer.WriteNumber("double", formatTest.VarDoubleOption.Value!.Value); + if (formatTest.DoubleOption.IsSet) + writer.WriteNumber("double", formatTest.DoubleOption.Value!.Value); - if (formatTest.VarFloatOption.IsSet) - writer.WriteNumber("float", formatTest.VarFloatOption.Value!.Value); + if (formatTest.FloatOption.IsSet) + writer.WriteNumber("float", formatTest.FloatOption.Value!.Value); if (formatTest.Int32Option.IsSet) writer.WriteNumber("int32", formatTest.Int32Option.Value!.Value); @@ -785,8 +785,8 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet) writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); - if (formatTest.VarStringOption.IsSet) - writer.WriteString("string", formatTest.VarString); + if (formatTest.StringOption.IsSet) + writer.WriteString("string", formatTest.String); if (formatTest.UnsignedIntegerOption.IsSet) writer.WriteNumber("unsigned_integer", formatTest.UnsignedIntegerOption.Value!.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs index 676b1d08c139..82b1b1fd6f16 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs @@ -248,11 +248,6 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO { writer.WriteStartObject(); - if (mammal.Pig != null) { - PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); - pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); - } - if (mammal.Whale != null) { WhaleJsonConverter whaleJsonConverter = (WhaleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Whale.GetType())); whaleJsonConverter.WriteProperties(ref writer, mammal.Whale, jsonSerializerOptions); @@ -263,6 +258,11 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO zebraJsonConverter.WriteProperties(ref writer, mammal.Zebra, jsonSerializerOptions); } + if (mammal.Pig != null) { + PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); + pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); + } + WriteProperties(ref writer, mammal, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs index 6d738cf1d6a5..1517f74fba5b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs @@ -35,12 +35,12 @@ public partial class Model200Response : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class /// name [JsonConstructor] - public Model200Response(Option varClass = default, Option name = default) + public Model200Response(Option @class = default, Option name = default) { - VarClassOption = varClass; + ClassOption = @class; NameOption = name; OnCreated(); } @@ -48,17 +48,17 @@ public Model200Response(Option varClass = default, Option name = partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("class")] - public string? VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string? Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Used to track the state of Name @@ -87,7 +87,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -191,11 +191,11 @@ public override void Write(Utf8JsonWriter writer, Model200Response model200Respo /// public void WriteProperties(ref Utf8JsonWriter writer, Model200Response model200Response, JsonSerializerOptions jsonSerializerOptions) { - if (model200Response.VarClassOption.IsSet && model200Response.VarClass == null) - throw new ArgumentNullException(nameof(model200Response.VarClass), "Property is required for class Model200Response."); + if (model200Response.ClassOption.IsSet && model200Response.Class == null) + throw new ArgumentNullException(nameof(model200Response.Class), "Property is required for class Model200Response."); - if (model200Response.VarClassOption.IsSet) - writer.WriteString("class", model200Response.VarClass); + if (model200Response.ClassOption.IsSet) + writer.WriteString("class", model200Response.Class); if (model200Response.NameOption.IsSet) writer.WriteNumber("name", model200Response.NameOption.Value!.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs index 5e07a4b642a9..b002e45bfe4d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs @@ -222,16 +222,16 @@ public override void Write(Utf8JsonWriter writer, NullableShape nullableShape, J { writer.WriteStartObject(); - if (nullableShape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); - } - if (nullableShape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, nullableShape.Triangle, jsonSerializerOptions); } + if (nullableShape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, nullableShape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs index e2c6672e77d8..d55650eca7fa 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs @@ -124,9 +124,6 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC } } - if (varString != null) - return new OneOfString(varString); - if (varString != null) return new OneOfString(varString); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs index 5eb22871d845..aee4d42d9dfd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs @@ -55,10 +55,10 @@ internal PolymorphicProperty(string varString) /// /// Initializes a new instance of the class. /// - /// - internal PolymorphicProperty(Object varObject) + /// + internal PolymorphicProperty(Object @object) { - VarObject = varObject; + Object = @object; OnCreated(); } @@ -85,9 +85,9 @@ internal PolymorphicProperty(List list) public string? VarString { get; set; } /// - /// Gets or Sets VarObject + /// Gets or Sets Object /// - public Object? VarObject { get; set; } + public Object? Object { get; set; } /// /// Gets or Sets List @@ -168,8 +168,8 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString); - Utf8JsonReader utf8JsonReaderVarObject = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarObject, jsonSerializerOptions, out varObject); + Utf8JsonReader utf8JsonReaderObject = utf8JsonReader; + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject); Utf8JsonReader utf8JsonReaderList = utf8JsonReader; OpenAPIClientUtils.TryDeserialize?>(ref utf8JsonReaderList, jsonSerializerOptions, out list); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs index dfb4799a35eb..2be618aac8da 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs @@ -222,16 +222,16 @@ public override void Write(Utf8JsonWriter writer, Quadrilateral quadrilateral, J { writer.WriteStartObject(); - if (quadrilateral.ComplexQuadrilateral != null) { - ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); - complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); - } - if (quadrilateral.SimpleQuadrilateral != null) { SimpleQuadrilateralJsonConverter simpleQuadrilateralJsonConverter = (SimpleQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.SimpleQuadrilateral.GetType())); simpleQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.SimpleQuadrilateral, jsonSerializerOptions); } + if (quadrilateral.ComplexQuadrilateral != null) { + ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); + complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, quadrilateral, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs index 3a3bf398ebc6..293cbd51601f 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs @@ -35,16 +35,34 @@ public partial class Return : IValidatableObject /// /// Initializes a new instance of the class. /// + /// lock + /// abstract /// varReturn + /// unsafe [JsonConstructor] - public Return(Option varReturn = default) + public Return(string @lock, string? @abstract = default, Option varReturn = default, Option @unsafe = default) { + Lock = @lock; + Abstract = @abstract; VarReturnOption = varReturn; + UnsafeOption = @unsafe; OnCreated(); } partial void OnCreated(); + /// + /// Gets or Sets Lock + /// + [JsonPropertyName("lock")] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [JsonPropertyName("abstract")] + public string? Abstract { get; set; } + /// /// Used to track the state of VarReturn /// @@ -58,6 +76,19 @@ public Return(Option varReturn = default) [JsonPropertyName("return")] public int? VarReturn { get { return this. VarReturnOption; } set { this.VarReturnOption = new(value); } } + /// + /// Used to track the state of Unsafe + /// + [JsonIgnore] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + public Option UnsafeOption { get; private set; } + + /// + /// Gets or Sets Unsafe + /// + [JsonPropertyName("unsafe")] + public string? Unsafe { get { return this. UnsafeOption; } set { this.UnsafeOption = new(value); } } + /// /// Gets or Sets additional properties /// @@ -72,7 +103,10 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -111,7 +145,10 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver JsonTokenType startingTokenType = utf8JsonReader.TokenType; + Option varLock = default; + Option varAbstract = default; Option varReturn = default; + Option varUnsafe = default; while (utf8JsonReader.Read()) { @@ -128,20 +165,41 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver switch (localVarJsonPropertyName) { + case "lock": + varLock = new Option(utf8JsonReader.GetString()!); + break; + case "abstract": + varAbstract = new Option(utf8JsonReader.GetString()); + break; case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) varReturn = new Option(utf8JsonReader.GetInt32()); break; + case "unsafe": + varUnsafe = new Option(utf8JsonReader.GetString()!); + break; default: break; } } } + if (!varLock.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varLock)); + + if (!varAbstract.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varAbstract)); + + if (varLock.IsSet && varLock.Value == null) + throw new ArgumentNullException(nameof(varLock), "Property is not nullable for class Return."); + if (varReturn.IsSet && varReturn.Value == null) throw new ArgumentNullException(nameof(varReturn), "Property is not nullable for class Return."); - return new Return(varReturn); + if (varUnsafe.IsSet && varUnsafe.Value == null) + throw new ArgumentNullException(nameof(varUnsafe), "Property is not nullable for class Return."); + + return new Return(varLock.Value!, varAbstract.Value!, varReturn, varUnsafe); } /// @@ -168,8 +226,24 @@ public override void Write(Utf8JsonWriter writer, Return varReturn, JsonSerializ /// public void WriteProperties(ref Utf8JsonWriter writer, Return varReturn, JsonSerializerOptions jsonSerializerOptions) { + if (varReturn.Lock == null) + throw new ArgumentNullException(nameof(varReturn.Lock), "Property is required for class Return."); + + if (varReturn.UnsafeOption.IsSet && varReturn.Unsafe == null) + throw new ArgumentNullException(nameof(varReturn.Unsafe), "Property is required for class Return."); + + writer.WriteString("lock", varReturn.Lock); + + if (varReturn.Abstract != null) + writer.WriteString("abstract", varReturn.Abstract); + else + writer.WriteNull("abstract"); + if (varReturn.VarReturnOption.IsSet) writer.WriteNumber("return", varReturn.VarReturnOption.Value!.Value); + + if (varReturn.UnsafeOption.IsSet) + writer.WriteString("unsafe", varReturn.Unsafe); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs index d7f628a58c9a..95ecd226efc4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs @@ -222,16 +222,16 @@ public override void Write(Utf8JsonWriter writer, Shape shape, JsonSerializerOpt { writer.WriteStartObject(); - if (shape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); - } - if (shape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shape.Triangle, jsonSerializerOptions); } + if (shape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs index b7063afd9a1c..53460b9461c2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs @@ -222,16 +222,16 @@ public override void Write(Utf8JsonWriter writer, ShapeOrNull shapeOrNull, JsonS { writer.WriteStartObject(); - if (shapeOrNull.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); - } - if (shapeOrNull.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shapeOrNull.Triangle, jsonSerializerOptions); } + if (shapeOrNull.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shapeOrNull, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md index 07cd7974a651..bb35816c9148 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md index b9b9d302c239..47e50daca3e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md index 849cd26c0b6f..fec6adcefdfd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md @@ -4,22 +4,22 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarByte** | **byte[]** | | +**Byte** | **byte[]** | | **Date** | **DateOnly** | | **Number** | **decimal** | | **Password** | **string** | | **Binary** | **System.IO.Stream** | | [optional] **DateTime** | **DateTime** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarDouble** | **double** | | [optional] -**VarFloat** | **float** | | [optional] +**Decimal** | **decimal** | | [optional] +**Double** | **double** | | [optional] +**Float** | **float** | | [optional] **Int32** | **int** | | [optional] **Int64** | **long** | | [optional] **Integer** | **int** | | [optional] **PatternWithBackslash** | **string** | None | [optional] **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] -**VarString** | **string** | | [optional] +**String** | **string** | | [optional] **UnsignedInteger** | **uint** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md index 31bbc3f6db17..2752a0d87c82 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md @@ -5,7 +5,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] **Name** | **int** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md index 1beb83fbaaf3..ad96a170bbbb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md @@ -5,7 +5,10 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Lock** | **string** | | +**Abstract** | **string** | | **VarReturn** | **int** | | [optional] +**Unsafe** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs index 995f04192dc0..42ee14da3bde 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs @@ -34,28 +34,28 @@ public partial class ClassModel : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class [JsonConstructor] - public ClassModel(Option varClass = default) + public ClassModel(Option @class = default) { - VarClassOption = varClass; + ClassOption = @class; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("_class")] - public string? VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string? Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -166,11 +166,11 @@ public override void Write(Utf8JsonWriter writer, ClassModel classModel, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, ClassModel classModel, JsonSerializerOptions jsonSerializerOptions) { - if (classModel.VarClassOption.IsSet && classModel.VarClass == null) - throw new ArgumentNullException(nameof(classModel.VarClass), "Property is required for class ClassModel."); + if (classModel.ClassOption.IsSet && classModel.Class == null) + throw new ArgumentNullException(nameof(classModel.Class), "Property is required for class ClassModel."); - if (classModel.VarClassOption.IsSet) - writer.WriteString("_class", classModel.VarClass); + if (classModel.ClassOption.IsSet) + writer.WriteString("_class", classModel.Class); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 09e11f0babbf..135e58b4f2a0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -34,28 +34,28 @@ public partial class FooGetDefaultResponse : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varString + /// string [JsonConstructor] - public FooGetDefaultResponse(Option varString = default) + public FooGetDefaultResponse(Option @string = default) { - VarStringOption = varString; + StringOption = @string; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public Foo? VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public Foo? String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -167,13 +167,13 @@ public override void Write(Utf8JsonWriter writer, FooGetDefaultResponse fooGetDe /// public void WriteProperties(ref Utf8JsonWriter writer, FooGetDefaultResponse fooGetDefaultResponse, JsonSerializerOptions jsonSerializerOptions) { - if (fooGetDefaultResponse.VarStringOption.IsSet && fooGetDefaultResponse.VarString == null) - throw new ArgumentNullException(nameof(fooGetDefaultResponse.VarString), "Property is required for class FooGetDefaultResponse."); + if (fooGetDefaultResponse.StringOption.IsSet && fooGetDefaultResponse.String == null) + throw new ArgumentNullException(nameof(fooGetDefaultResponse.String), "Property is required for class FooGetDefaultResponse."); - if (fooGetDefaultResponse.VarStringOption.IsSet) + if (fooGetDefaultResponse.StringOption.IsSet) { writer.WritePropertyName("string"); - JsonSerializer.Serialize(writer, fooGetDefaultResponse.VarString, jsonSerializerOptions); + JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, jsonSerializerOptions); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index 8b590db2f662..05c25ec783c7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -34,44 +34,44 @@ public partial class FormatTest : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varByte + /// byte /// date /// number /// password /// binary /// dateTime - /// varDecimal - /// varDouble - /// varFloat + /// decimal + /// double + /// float /// int32 /// int64 /// integer /// None /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. - /// varString + /// string /// unsignedInteger /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option varDecimal = default, Option varDouble = default, Option varFloat = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option varString = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) + public FormatTest(byte[] @byte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option @decimal = default, Option @double = default, Option @float = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option @string = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) { - VarByte = varByte; + Byte = @byte; Date = date; Number = number; Password = password; BinaryOption = binary; DateTimeOption = dateTime; - VarDecimalOption = varDecimal; - VarDoubleOption = varDouble; - VarFloatOption = varFloat; + DecimalOption = @decimal; + DoubleOption = @double; + FloatOption = @float; Int32Option = int32; Int64Option = int64; IntegerOption = integer; PatternWithBackslashOption = patternWithBackslash; PatternWithDigitsOption = patternWithDigits; PatternWithDigitsAndDelimiterOption = patternWithDigitsAndDelimiter; - VarStringOption = varString; + StringOption = @string; UnsignedIntegerOption = unsignedInteger; UnsignedLongOption = unsignedLong; UuidOption = uuid; @@ -81,10 +81,10 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password partial void OnCreated(); /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [JsonPropertyName("byte")] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Date @@ -133,43 +133,43 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public DateTime? DateTime { get { return this. DateTimeOption; } set { this.DateTimeOption = new(value); } } /// - /// Used to track the state of VarDecimal + /// Used to track the state of Decimal /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDecimalOption { get; private set; } + public Option DecimalOption { get; private set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [JsonPropertyName("decimal")] - public decimal? VarDecimal { get { return this. VarDecimalOption; } set { this.VarDecimalOption = new(value); } } + public decimal? Decimal { get { return this. DecimalOption; } set { this.DecimalOption = new(value); } } /// - /// Used to track the state of VarDouble + /// Used to track the state of Double /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDoubleOption { get; private set; } + public Option DoubleOption { get; private set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [JsonPropertyName("double")] - public double? VarDouble { get { return this. VarDoubleOption; } set { this.VarDoubleOption = new(value); } } + public double? Double { get { return this. DoubleOption; } set { this.DoubleOption = new(value); } } /// - /// Used to track the state of VarFloat + /// Used to track the state of Float /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarFloatOption { get; private set; } + public Option FloatOption { get; private set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [JsonPropertyName("float")] - public float? VarFloat { get { return this. VarFloatOption; } set { this.VarFloatOption = new(value); } } + public float? Float { get { return this. FloatOption; } set { this.FloatOption = new(value); } } /// /// Used to track the state of Int32 @@ -253,17 +253,17 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public string? PatternWithDigitsAndDelimiter { get { return this. PatternWithDigitsAndDelimiterOption; } set { this.PatternWithDigitsAndDelimiterOption = new(value); } } /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public string? VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public string? String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Used to track the state of UnsignedInteger @@ -319,22 +319,22 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FormatTest {\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Password: ").Append(Password).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" PatternWithBackslash: ").Append(PatternWithBackslash).Append("\n"); sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); @@ -374,28 +374,28 @@ public override string ToString() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - // VarDouble (double) maximum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value > (double)123.4) + // Double (double) maximum + if (this.DoubleOption.IsSet && this.DoubleOption.Value > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value < (double)67.8) + // Double (double) minimum + if (this.DoubleOption.IsSet && this.DoubleOption.Value < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - // VarFloat (float) maximum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value > (float)987.6) + // Float (float) maximum + if (this.FloatOption.IsSet && this.FloatOption.Value > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value < (float)54.3) + // Float (float) minimum + if (this.FloatOption.IsSet && this.FloatOption.Value < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } // Int32 (int) maximum @@ -452,13 +452,13 @@ public override string ToString() } } - if (this.VarStringOption.Value != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (this.StringOption.Value != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (this.VarStringOption.Value != null &&!regexVarString.Match(this.VarStringOption.Value).Success) + if (this.StringOption.Value != null &&!regexString.Match(this.StringOption.Value).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } @@ -718,8 +718,8 @@ public override void Write(Utf8JsonWriter writer, FormatTest formatTest, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, JsonSerializerOptions jsonSerializerOptions) { - if (formatTest.VarByte == null) - throw new ArgumentNullException(nameof(formatTest.VarByte), "Property is required for class FormatTest."); + if (formatTest.Byte == null) + throw new ArgumentNullException(nameof(formatTest.Byte), "Property is required for class FormatTest."); if (formatTest.Password == null) throw new ArgumentNullException(nameof(formatTest.Password), "Property is required for class FormatTest."); @@ -736,11 +736,11 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet && formatTest.PatternWithDigitsAndDelimiter == null) throw new ArgumentNullException(nameof(formatTest.PatternWithDigitsAndDelimiter), "Property is required for class FormatTest."); - if (formatTest.VarStringOption.IsSet && formatTest.VarString == null) - throw new ArgumentNullException(nameof(formatTest.VarString), "Property is required for class FormatTest."); + if (formatTest.StringOption.IsSet && formatTest.String == null) + throw new ArgumentNullException(nameof(formatTest.String), "Property is required for class FormatTest."); writer.WritePropertyName("byte"); - JsonSerializer.Serialize(writer, formatTest.VarByte, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Byte, jsonSerializerOptions); writer.WriteString("date", formatTest.Date.ToString(DateFormat)); writer.WriteNumber("number", formatTest.Number); @@ -755,16 +755,16 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.DateTimeOption.IsSet) writer.WriteString("dateTime", formatTest.DateTimeOption.Value!.Value.ToString(DateTimeFormat)); - if (formatTest.VarDecimalOption.IsSet) + if (formatTest.DecimalOption.IsSet) { writer.WritePropertyName("decimal"); - JsonSerializer.Serialize(writer, formatTest.VarDecimal, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Decimal, jsonSerializerOptions); } - if (formatTest.VarDoubleOption.IsSet) - writer.WriteNumber("double", formatTest.VarDoubleOption.Value!.Value); + if (formatTest.DoubleOption.IsSet) + writer.WriteNumber("double", formatTest.DoubleOption.Value!.Value); - if (formatTest.VarFloatOption.IsSet) - writer.WriteNumber("float", formatTest.VarFloatOption.Value!.Value); + if (formatTest.FloatOption.IsSet) + writer.WriteNumber("float", formatTest.FloatOption.Value!.Value); if (formatTest.Int32Option.IsSet) writer.WriteNumber("int32", formatTest.Int32Option.Value!.Value); @@ -784,8 +784,8 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet) writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); - if (formatTest.VarStringOption.IsSet) - writer.WriteString("string", formatTest.VarString); + if (formatTest.StringOption.IsSet) + writer.WriteString("string", formatTest.String); if (formatTest.UnsignedIntegerOption.IsSet) writer.WriteNumber("unsigned_integer", formatTest.UnsignedIntegerOption.Value!.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs index 40b4a549ca6c..5b6c5f2e58e0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs @@ -247,11 +247,6 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO { writer.WriteStartObject(); - if (mammal.Pig != null) { - PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); - pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); - } - if (mammal.Whale != null) { WhaleJsonConverter whaleJsonConverter = (WhaleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Whale.GetType())); whaleJsonConverter.WriteProperties(ref writer, mammal.Whale, jsonSerializerOptions); @@ -262,6 +257,11 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO zebraJsonConverter.WriteProperties(ref writer, mammal.Zebra, jsonSerializerOptions); } + if (mammal.Pig != null) { + PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); + pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); + } + WriteProperties(ref writer, mammal, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs index 42e64ef20547..1c7106f65f50 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs @@ -34,12 +34,12 @@ public partial class Model200Response : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class /// name [JsonConstructor] - public Model200Response(Option varClass = default, Option name = default) + public Model200Response(Option @class = default, Option name = default) { - VarClassOption = varClass; + ClassOption = @class; NameOption = name; OnCreated(); } @@ -47,17 +47,17 @@ public Model200Response(Option varClass = default, Option name = partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("class")] - public string? VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string? Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Used to track the state of Name @@ -86,7 +86,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -190,11 +190,11 @@ public override void Write(Utf8JsonWriter writer, Model200Response model200Respo /// public void WriteProperties(ref Utf8JsonWriter writer, Model200Response model200Response, JsonSerializerOptions jsonSerializerOptions) { - if (model200Response.VarClassOption.IsSet && model200Response.VarClass == null) - throw new ArgumentNullException(nameof(model200Response.VarClass), "Property is required for class Model200Response."); + if (model200Response.ClassOption.IsSet && model200Response.Class == null) + throw new ArgumentNullException(nameof(model200Response.Class), "Property is required for class Model200Response."); - if (model200Response.VarClassOption.IsSet) - writer.WriteString("class", model200Response.VarClass); + if (model200Response.ClassOption.IsSet) + writer.WriteString("class", model200Response.Class); if (model200Response.NameOption.IsSet) writer.WriteNumber("name", model200Response.NameOption.Value!.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs index 863a29111dd5..f77cc1947a12 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs @@ -221,16 +221,16 @@ public override void Write(Utf8JsonWriter writer, NullableShape nullableShape, J { writer.WriteStartObject(); - if (nullableShape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); - } - if (nullableShape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, nullableShape.Triangle, jsonSerializerOptions); } + if (nullableShape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, nullableShape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs index a0a54c250670..abab41e9e99e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs @@ -123,9 +123,6 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC } } - if (varString != null) - return new OneOfString(varString); - if (varString != null) return new OneOfString(varString); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 1333f4a725d6..3ef31825a6eb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -54,10 +54,10 @@ internal PolymorphicProperty(string varString) /// /// Initializes a new instance of the class. /// - /// - internal PolymorphicProperty(Object varObject) + /// + internal PolymorphicProperty(Object @object) { - VarObject = varObject; + Object = @object; OnCreated(); } @@ -84,9 +84,9 @@ internal PolymorphicProperty(List list) public string? VarString { get; set; } /// - /// Gets or Sets VarObject + /// Gets or Sets Object /// - public Object? VarObject { get; set; } + public Object? Object { get; set; } /// /// Gets or Sets List @@ -167,8 +167,8 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString); - Utf8JsonReader utf8JsonReaderVarObject = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarObject, jsonSerializerOptions, out varObject); + Utf8JsonReader utf8JsonReaderObject = utf8JsonReader; + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject); Utf8JsonReader utf8JsonReaderList = utf8JsonReader; OpenAPIClientUtils.TryDeserialize?>(ref utf8JsonReaderList, jsonSerializerOptions, out list); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs index 5b20c6e30689..e5bf2ef2a02c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -221,16 +221,16 @@ public override void Write(Utf8JsonWriter writer, Quadrilateral quadrilateral, J { writer.WriteStartObject(); - if (quadrilateral.ComplexQuadrilateral != null) { - ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); - complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); - } - if (quadrilateral.SimpleQuadrilateral != null) { SimpleQuadrilateralJsonConverter simpleQuadrilateralJsonConverter = (SimpleQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.SimpleQuadrilateral.GetType())); simpleQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.SimpleQuadrilateral, jsonSerializerOptions); } + if (quadrilateral.ComplexQuadrilateral != null) { + ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); + complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, quadrilateral, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs index 5449201bcf15..f4b2af37c011 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs @@ -34,16 +34,34 @@ public partial class Return : IValidatableObject /// /// Initializes a new instance of the class. /// + /// lock + /// abstract /// varReturn + /// unsafe [JsonConstructor] - public Return(Option varReturn = default) + public Return(string @lock, string? @abstract = default, Option varReturn = default, Option @unsafe = default) { + Lock = @lock; + Abstract = @abstract; VarReturnOption = varReturn; + UnsafeOption = @unsafe; OnCreated(); } partial void OnCreated(); + /// + /// Gets or Sets Lock + /// + [JsonPropertyName("lock")] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [JsonPropertyName("abstract")] + public string? Abstract { get; set; } + /// /// Used to track the state of VarReturn /// @@ -57,6 +75,19 @@ public Return(Option varReturn = default) [JsonPropertyName("return")] public int? VarReturn { get { return this. VarReturnOption; } set { this.VarReturnOption = new(value); } } + /// + /// Used to track the state of Unsafe + /// + [JsonIgnore] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + public Option UnsafeOption { get; private set; } + + /// + /// Gets or Sets Unsafe + /// + [JsonPropertyName("unsafe")] + public string? Unsafe { get { return this. UnsafeOption; } set { this.UnsafeOption = new(value); } } + /// /// Gets or Sets additional properties /// @@ -71,7 +102,10 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -110,7 +144,10 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver JsonTokenType startingTokenType = utf8JsonReader.TokenType; + Option varLock = default; + Option varAbstract = default; Option varReturn = default; + Option varUnsafe = default; while (utf8JsonReader.Read()) { @@ -127,20 +164,41 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver switch (localVarJsonPropertyName) { + case "lock": + varLock = new Option(utf8JsonReader.GetString()!); + break; + case "abstract": + varAbstract = new Option(utf8JsonReader.GetString()); + break; case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) varReturn = new Option(utf8JsonReader.GetInt32()); break; + case "unsafe": + varUnsafe = new Option(utf8JsonReader.GetString()!); + break; default: break; } } } + if (!varLock.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varLock)); + + if (!varAbstract.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varAbstract)); + + if (varLock.IsSet && varLock.Value == null) + throw new ArgumentNullException(nameof(varLock), "Property is not nullable for class Return."); + if (varReturn.IsSet && varReturn.Value == null) throw new ArgumentNullException(nameof(varReturn), "Property is not nullable for class Return."); - return new Return(varReturn); + if (varUnsafe.IsSet && varUnsafe.Value == null) + throw new ArgumentNullException(nameof(varUnsafe), "Property is not nullable for class Return."); + + return new Return(varLock.Value!, varAbstract.Value!, varReturn, varUnsafe); } /// @@ -167,8 +225,24 @@ public override void Write(Utf8JsonWriter writer, Return varReturn, JsonSerializ /// public void WriteProperties(ref Utf8JsonWriter writer, Return varReturn, JsonSerializerOptions jsonSerializerOptions) { + if (varReturn.Lock == null) + throw new ArgumentNullException(nameof(varReturn.Lock), "Property is required for class Return."); + + if (varReturn.UnsafeOption.IsSet && varReturn.Unsafe == null) + throw new ArgumentNullException(nameof(varReturn.Unsafe), "Property is required for class Return."); + + writer.WriteString("lock", varReturn.Lock); + + if (varReturn.Abstract != null) + writer.WriteString("abstract", varReturn.Abstract); + else + writer.WriteNull("abstract"); + if (varReturn.VarReturnOption.IsSet) writer.WriteNumber("return", varReturn.VarReturnOption.Value!.Value); + + if (varReturn.UnsafeOption.IsSet) + writer.WriteString("unsafe", varReturn.Unsafe); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index f2e26ef8c5ae..a8043ce2c4c5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -221,16 +221,16 @@ public override void Write(Utf8JsonWriter writer, Shape shape, JsonSerializerOpt { writer.WriteStartObject(); - if (shape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); - } - if (shape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shape.Triangle, jsonSerializerOptions); } + if (shape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index b7c92c1f884e..d05ff4a70d75 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -221,16 +221,16 @@ public override void Write(Utf8JsonWriter writer, ShapeOrNull shapeOrNull, JsonS { writer.WriteStartObject(); - if (shapeOrNull.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); - } - if (shapeOrNull.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shapeOrNull.Triangle, jsonSerializerOptions); } + if (shapeOrNull.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shapeOrNull, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md index 07cd7974a651..bb35816c9148 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md index b9b9d302c239..47e50daca3e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md index 849cd26c0b6f..fec6adcefdfd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md @@ -4,22 +4,22 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarByte** | **byte[]** | | +**Byte** | **byte[]** | | **Date** | **DateOnly** | | **Number** | **decimal** | | **Password** | **string** | | **Binary** | **System.IO.Stream** | | [optional] **DateTime** | **DateTime** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarDouble** | **double** | | [optional] -**VarFloat** | **float** | | [optional] +**Decimal** | **decimal** | | [optional] +**Double** | **double** | | [optional] +**Float** | **float** | | [optional] **Int32** | **int** | | [optional] **Int64** | **long** | | [optional] **Integer** | **int** | | [optional] **PatternWithBackslash** | **string** | None | [optional] **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] -**VarString** | **string** | | [optional] +**String** | **string** | | [optional] **UnsignedInteger** | **uint** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md index 31bbc3f6db17..2752a0d87c82 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md @@ -5,7 +5,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] **Name** | **int** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md index 1beb83fbaaf3..ad96a170bbbb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md @@ -5,7 +5,10 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Lock** | **string** | | +**Abstract** | **string** | | **VarReturn** | **int** | | [optional] +**Unsafe** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs index bbed8f0df133..4c3e4ab06661 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -32,28 +32,28 @@ public partial class ClassModel : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class [JsonConstructor] - public ClassModel(Option varClass = default) + public ClassModel(Option @class = default) { - VarClassOption = varClass; + ClassOption = @class; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("_class")] - public string VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Gets or Sets additional properties @@ -69,7 +69,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -164,11 +164,11 @@ public override void Write(Utf8JsonWriter writer, ClassModel classModel, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, ClassModel classModel, JsonSerializerOptions jsonSerializerOptions) { - if (classModel.VarClassOption.IsSet && classModel.VarClass == null) - throw new ArgumentNullException(nameof(classModel.VarClass), "Property is required for class ClassModel."); + if (classModel.ClassOption.IsSet && classModel.Class == null) + throw new ArgumentNullException(nameof(classModel.Class), "Property is required for class ClassModel."); - if (classModel.VarClassOption.IsSet) - writer.WriteString("_class", classModel.VarClass); + if (classModel.ClassOption.IsSet) + writer.WriteString("_class", classModel.Class); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 5834385cd5bb..569ba01f6d7a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -32,28 +32,28 @@ public partial class FooGetDefaultResponse : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varString + /// string [JsonConstructor] - public FooGetDefaultResponse(Option varString = default) + public FooGetDefaultResponse(Option @string = default) { - VarStringOption = varString; + StringOption = @string; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public Foo VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public Foo String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Gets or Sets additional properties @@ -69,7 +69,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -165,13 +165,13 @@ public override void Write(Utf8JsonWriter writer, FooGetDefaultResponse fooGetDe /// public void WriteProperties(ref Utf8JsonWriter writer, FooGetDefaultResponse fooGetDefaultResponse, JsonSerializerOptions jsonSerializerOptions) { - if (fooGetDefaultResponse.VarStringOption.IsSet && fooGetDefaultResponse.VarString == null) - throw new ArgumentNullException(nameof(fooGetDefaultResponse.VarString), "Property is required for class FooGetDefaultResponse."); + if (fooGetDefaultResponse.StringOption.IsSet && fooGetDefaultResponse.String == null) + throw new ArgumentNullException(nameof(fooGetDefaultResponse.String), "Property is required for class FooGetDefaultResponse."); - if (fooGetDefaultResponse.VarStringOption.IsSet) + if (fooGetDefaultResponse.StringOption.IsSet) { writer.WritePropertyName("string"); - JsonSerializer.Serialize(writer, fooGetDefaultResponse.VarString, jsonSerializerOptions); + JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, jsonSerializerOptions); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 779fb7f81b16..ffee71bd1e25 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -32,44 +32,44 @@ public partial class FormatTest : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varByte + /// byte /// date /// number /// password /// binary /// dateTime - /// varDecimal - /// varDouble - /// varFloat + /// decimal + /// double + /// float /// int32 /// int64 /// integer /// None /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. - /// varString + /// string /// unsignedInteger /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option varDecimal = default, Option varDouble = default, Option varFloat = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option varString = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) + public FormatTest(byte[] @byte, DateOnly date, decimal number, string password, Option binary = default, Option dateTime = default, Option @decimal = default, Option @double = default, Option @float = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option @string = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) { - VarByte = varByte; + Byte = @byte; Date = date; Number = number; Password = password; BinaryOption = binary; DateTimeOption = dateTime; - VarDecimalOption = varDecimal; - VarDoubleOption = varDouble; - VarFloatOption = varFloat; + DecimalOption = @decimal; + DoubleOption = @double; + FloatOption = @float; Int32Option = int32; Int64Option = int64; IntegerOption = integer; PatternWithBackslashOption = patternWithBackslash; PatternWithDigitsOption = patternWithDigits; PatternWithDigitsAndDelimiterOption = patternWithDigitsAndDelimiter; - VarStringOption = varString; + StringOption = @string; UnsignedIntegerOption = unsignedInteger; UnsignedLongOption = unsignedLong; UuidOption = uuid; @@ -79,10 +79,10 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password partial void OnCreated(); /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [JsonPropertyName("byte")] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Date @@ -131,43 +131,43 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public DateTime? DateTime { get { return this. DateTimeOption; } set { this.DateTimeOption = new(value); } } /// - /// Used to track the state of VarDecimal + /// Used to track the state of Decimal /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDecimalOption { get; private set; } + public Option DecimalOption { get; private set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [JsonPropertyName("decimal")] - public decimal? VarDecimal { get { return this. VarDecimalOption; } set { this.VarDecimalOption = new(value); } } + public decimal? Decimal { get { return this. DecimalOption; } set { this.DecimalOption = new(value); } } /// - /// Used to track the state of VarDouble + /// Used to track the state of Double /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDoubleOption { get; private set; } + public Option DoubleOption { get; private set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [JsonPropertyName("double")] - public double? VarDouble { get { return this. VarDoubleOption; } set { this.VarDoubleOption = new(value); } } + public double? Double { get { return this. DoubleOption; } set { this.DoubleOption = new(value); } } /// - /// Used to track the state of VarFloat + /// Used to track the state of Float /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarFloatOption { get; private set; } + public Option FloatOption { get; private set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [JsonPropertyName("float")] - public float? VarFloat { get { return this. VarFloatOption; } set { this.VarFloatOption = new(value); } } + public float? Float { get { return this. FloatOption; } set { this.FloatOption = new(value); } } /// /// Used to track the state of Int32 @@ -251,17 +251,17 @@ public FormatTest(byte[] varByte, DateOnly date, decimal number, string password public string PatternWithDigitsAndDelimiter { get { return this. PatternWithDigitsAndDelimiterOption; } set { this.PatternWithDigitsAndDelimiterOption = new(value); } } /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public string VarString { get { return this. VarStringOption; } set { this.VarStringOption = new(value); } } + public string String { get { return this. StringOption; } set { this.StringOption = new(value); } } /// /// Used to track the state of UnsignedInteger @@ -317,22 +317,22 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FormatTest {\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Password: ").Append(Password).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" PatternWithBackslash: ").Append(PatternWithBackslash).Append("\n"); sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); @@ -372,28 +372,28 @@ public override string ToString() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - // VarDouble (double) maximum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value > (double)123.4) + // Double (double) maximum + if (this.DoubleOption.IsSet && this.DoubleOption.Value > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value < (double)67.8) + // Double (double) minimum + if (this.DoubleOption.IsSet && this.DoubleOption.Value < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - // VarFloat (float) maximum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value > (float)987.6) + // Float (float) maximum + if (this.FloatOption.IsSet && this.FloatOption.Value > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value < (float)54.3) + // Float (float) minimum + if (this.FloatOption.IsSet && this.FloatOption.Value < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } // Int32 (int) maximum @@ -450,13 +450,13 @@ public override string ToString() } } - if (this.VarStringOption.Value != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (this.StringOption.Value != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (this.VarStringOption.Value != null &&!regexVarString.Match(this.VarStringOption.Value).Success) + if (this.StringOption.Value != null &&!regexString.Match(this.StringOption.Value).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } @@ -716,8 +716,8 @@ public override void Write(Utf8JsonWriter writer, FormatTest formatTest, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, JsonSerializerOptions jsonSerializerOptions) { - if (formatTest.VarByte == null) - throw new ArgumentNullException(nameof(formatTest.VarByte), "Property is required for class FormatTest."); + if (formatTest.Byte == null) + throw new ArgumentNullException(nameof(formatTest.Byte), "Property is required for class FormatTest."); if (formatTest.Password == null) throw new ArgumentNullException(nameof(formatTest.Password), "Property is required for class FormatTest."); @@ -734,11 +734,11 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet && formatTest.PatternWithDigitsAndDelimiter == null) throw new ArgumentNullException(nameof(formatTest.PatternWithDigitsAndDelimiter), "Property is required for class FormatTest."); - if (formatTest.VarStringOption.IsSet && formatTest.VarString == null) - throw new ArgumentNullException(nameof(formatTest.VarString), "Property is required for class FormatTest."); + if (formatTest.StringOption.IsSet && formatTest.String == null) + throw new ArgumentNullException(nameof(formatTest.String), "Property is required for class FormatTest."); writer.WritePropertyName("byte"); - JsonSerializer.Serialize(writer, formatTest.VarByte, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Byte, jsonSerializerOptions); writer.WriteString("date", formatTest.Date.ToString(DateFormat)); writer.WriteNumber("number", formatTest.Number); @@ -753,16 +753,16 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.DateTimeOption.IsSet) writer.WriteString("dateTime", formatTest.DateTimeOption.Value.Value.ToString(DateTimeFormat)); - if (formatTest.VarDecimalOption.IsSet) + if (formatTest.DecimalOption.IsSet) { writer.WritePropertyName("decimal"); - JsonSerializer.Serialize(writer, formatTest.VarDecimal, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Decimal, jsonSerializerOptions); } - if (formatTest.VarDoubleOption.IsSet) - writer.WriteNumber("double", formatTest.VarDoubleOption.Value.Value); + if (formatTest.DoubleOption.IsSet) + writer.WriteNumber("double", formatTest.DoubleOption.Value.Value); - if (formatTest.VarFloatOption.IsSet) - writer.WriteNumber("float", formatTest.VarFloatOption.Value.Value); + if (formatTest.FloatOption.IsSet) + writer.WriteNumber("float", formatTest.FloatOption.Value.Value); if (formatTest.Int32Option.IsSet) writer.WriteNumber("int32", formatTest.Int32Option.Value.Value); @@ -782,8 +782,8 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet) writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); - if (formatTest.VarStringOption.IsSet) - writer.WriteString("string", formatTest.VarString); + if (formatTest.StringOption.IsSet) + writer.WriteString("string", formatTest.String); if (formatTest.UnsignedIntegerOption.IsSet) writer.WriteNumber("unsigned_integer", formatTest.UnsignedIntegerOption.Value.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs index 1ea0d944f050..05e439a9c3e6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -245,11 +245,6 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO { writer.WriteStartObject(); - if (mammal.Pig != null) { - PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); - pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); - } - if (mammal.Whale != null) { WhaleJsonConverter whaleJsonConverter = (WhaleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Whale.GetType())); whaleJsonConverter.WriteProperties(ref writer, mammal.Whale, jsonSerializerOptions); @@ -260,6 +255,11 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO zebraJsonConverter.WriteProperties(ref writer, mammal.Zebra, jsonSerializerOptions); } + if (mammal.Pig != null) { + PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); + pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); + } + WriteProperties(ref writer, mammal, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs index 5defbb2c2fda..dd059ccf59e9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -32,12 +32,12 @@ public partial class Model200Response : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class /// name [JsonConstructor] - public Model200Response(Option varClass = default, Option name = default) + public Model200Response(Option @class = default, Option name = default) { - VarClassOption = varClass; + ClassOption = @class; NameOption = name; OnCreated(); } @@ -45,17 +45,17 @@ public Model200Response(Option varClass = default, Option name = d partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("class")] - public string VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new(value); } } + public string Class { get { return this. ClassOption; } set { this.ClassOption = new(value); } } /// /// Used to track the state of Name @@ -84,7 +84,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -188,11 +188,11 @@ public override void Write(Utf8JsonWriter writer, Model200Response model200Respo /// public void WriteProperties(ref Utf8JsonWriter writer, Model200Response model200Response, JsonSerializerOptions jsonSerializerOptions) { - if (model200Response.VarClassOption.IsSet && model200Response.VarClass == null) - throw new ArgumentNullException(nameof(model200Response.VarClass), "Property is required for class Model200Response."); + if (model200Response.ClassOption.IsSet && model200Response.Class == null) + throw new ArgumentNullException(nameof(model200Response.Class), "Property is required for class Model200Response."); - if (model200Response.VarClassOption.IsSet) - writer.WriteString("class", model200Response.VarClass); + if (model200Response.ClassOption.IsSet) + writer.WriteString("class", model200Response.Class); if (model200Response.NameOption.IsSet) writer.WriteNumber("name", model200Response.NameOption.Value.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs index 1e38640c8af9..d66595994262 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, NullableShape nullableShape, J { writer.WriteStartObject(); - if (nullableShape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); - } - if (nullableShape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, nullableShape.Triangle, jsonSerializerOptions); } + if (nullableShape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, nullableShape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs index 660604e3ef17..6e94b861b234 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs @@ -121,9 +121,6 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC } } - if (varString != null) - return new OneOfString(varString); - if (varString != null) return new OneOfString(varString); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 2c2227a22512..a973bcddf8c5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -52,10 +52,10 @@ internal PolymorphicProperty(string varString) /// /// Initializes a new instance of the class. /// - /// - internal PolymorphicProperty(Object varObject) + /// + internal PolymorphicProperty(Object @object) { - VarObject = varObject; + Object = @object; OnCreated(); } @@ -82,9 +82,9 @@ internal PolymorphicProperty(List list) public string VarString { get; set; } /// - /// Gets or Sets VarObject + /// Gets or Sets Object /// - public Object VarObject { get; set; } + public Object Object { get; set; } /// /// Gets or Sets List @@ -165,8 +165,8 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString); - Utf8JsonReader utf8JsonReaderVarObject = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarObject, jsonSerializerOptions, out varObject); + Utf8JsonReader utf8JsonReaderObject = utf8JsonReader; + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject); Utf8JsonReader utf8JsonReaderList = utf8JsonReader; OpenAPIClientUtils.TryDeserialize>(ref utf8JsonReaderList, jsonSerializerOptions, out list); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index 3f4034a17713..f3ef21718ae4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, Quadrilateral quadrilateral, J { writer.WriteStartObject(); - if (quadrilateral.ComplexQuadrilateral != null) { - ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); - complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); - } - if (quadrilateral.SimpleQuadrilateral != null) { SimpleQuadrilateralJsonConverter simpleQuadrilateralJsonConverter = (SimpleQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.SimpleQuadrilateral.GetType())); simpleQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.SimpleQuadrilateral, jsonSerializerOptions); } + if (quadrilateral.ComplexQuadrilateral != null) { + ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); + complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, quadrilateral, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs index 604c4abd4e06..b6099cae8818 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs @@ -32,16 +32,34 @@ public partial class Return : IValidatableObject /// /// Initializes a new instance of the class. /// + /// lock + /// abstract /// varReturn + /// unsafe [JsonConstructor] - public Return(Option varReturn = default) + public Return(string @lock, string @abstract = default, Option varReturn = default, Option @unsafe = default) { + Lock = @lock; + Abstract = @abstract; VarReturnOption = varReturn; + UnsafeOption = @unsafe; OnCreated(); } partial void OnCreated(); + /// + /// Gets or Sets Lock + /// + [JsonPropertyName("lock")] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [JsonPropertyName("abstract")] + public string Abstract { get; set; } + /// /// Used to track the state of VarReturn /// @@ -55,6 +73,19 @@ public Return(Option varReturn = default) [JsonPropertyName("return")] public int? VarReturn { get { return this. VarReturnOption; } set { this.VarReturnOption = new(value); } } + /// + /// Used to track the state of Unsafe + /// + [JsonIgnore] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + public Option UnsafeOption { get; private set; } + + /// + /// Gets or Sets Unsafe + /// + [JsonPropertyName("unsafe")] + public string Unsafe { get { return this. UnsafeOption; } set { this.UnsafeOption = new(value); } } + /// /// Gets or Sets additional properties /// @@ -69,7 +100,10 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -108,7 +142,10 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver JsonTokenType startingTokenType = utf8JsonReader.TokenType; + Option varLock = default; + Option varAbstract = default; Option varReturn = default; + Option varUnsafe = default; while (utf8JsonReader.Read()) { @@ -125,20 +162,41 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver switch (localVarJsonPropertyName) { + case "lock": + varLock = new Option(utf8JsonReader.GetString()); + break; + case "abstract": + varAbstract = new Option(utf8JsonReader.GetString()); + break; case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) varReturn = new Option(utf8JsonReader.GetInt32()); break; + case "unsafe": + varUnsafe = new Option(utf8JsonReader.GetString()); + break; default: break; } } } + if (!varLock.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varLock)); + + if (!varAbstract.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varAbstract)); + + if (varLock.IsSet && varLock.Value == null) + throw new ArgumentNullException(nameof(varLock), "Property is not nullable for class Return."); + if (varReturn.IsSet && varReturn.Value == null) throw new ArgumentNullException(nameof(varReturn), "Property is not nullable for class Return."); - return new Return(varReturn); + if (varUnsafe.IsSet && varUnsafe.Value == null) + throw new ArgumentNullException(nameof(varUnsafe), "Property is not nullable for class Return."); + + return new Return(varLock.Value, varAbstract.Value, varReturn, varUnsafe); } /// @@ -165,8 +223,24 @@ public override void Write(Utf8JsonWriter writer, Return varReturn, JsonSerializ /// public void WriteProperties(ref Utf8JsonWriter writer, Return varReturn, JsonSerializerOptions jsonSerializerOptions) { + if (varReturn.Lock == null) + throw new ArgumentNullException(nameof(varReturn.Lock), "Property is required for class Return."); + + if (varReturn.UnsafeOption.IsSet && varReturn.Unsafe == null) + throw new ArgumentNullException(nameof(varReturn.Unsafe), "Property is required for class Return."); + + writer.WriteString("lock", varReturn.Lock); + + if (varReturn.Abstract != null) + writer.WriteString("abstract", varReturn.Abstract); + else + writer.WriteNull("abstract"); + if (varReturn.VarReturnOption.IsSet) writer.WriteNumber("return", varReturn.VarReturnOption.Value.Value); + + if (varReturn.UnsafeOption.IsSet) + writer.WriteString("unsafe", varReturn.Unsafe); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs index 575069f242e0..ffd95a8fdff1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, Shape shape, JsonSerializerOpt { writer.WriteStartObject(); - if (shape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); - } - if (shape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shape.Triangle, jsonSerializerOptions); } + if (shape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index a26dab034230..d60f396c70da 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, ShapeOrNull shapeOrNull, JsonS { writer.WriteStartObject(); - if (shapeOrNull.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); - } - if (shapeOrNull.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shapeOrNull.Triangle, jsonSerializerOptions); } + if (shapeOrNull.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shapeOrNull, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md index 07cd7974a651..bb35816c9148 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md index b9b9d302c239..47e50daca3e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md index ab628ed7bc0b..0983002c5da1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md @@ -4,22 +4,22 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarByte** | **byte[]** | | +**Byte** | **byte[]** | | **Date** | **DateTime** | | **Number** | **decimal** | | **Password** | **string** | | **Binary** | **System.IO.Stream** | | [optional] **DateTime** | **DateTime** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarDouble** | **double** | | [optional] -**VarFloat** | **float** | | [optional] +**Decimal** | **decimal** | | [optional] +**Double** | **double** | | [optional] +**Float** | **float** | | [optional] **Int32** | **int** | | [optional] **Int64** | **long** | | [optional] **Integer** | **int** | | [optional] **PatternWithBackslash** | **string** | None | [optional] **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] -**VarString** | **string** | | [optional] +**String** | **string** | | [optional] **UnsignedInteger** | **uint** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md index 31bbc3f6db17..2752a0d87c82 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md @@ -5,7 +5,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] **Name** | **int** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md index 1beb83fbaaf3..ad96a170bbbb 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md @@ -5,7 +5,10 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**Lock** | **string** | | +**Abstract** | **string** | | **VarReturn** | **int** | | [optional] +**Unsafe** | **string** | | [optional] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs index b7ef5105c6a1..50e9995e1b4e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -32,28 +32,28 @@ public partial class ClassModel : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class [JsonConstructor] - public ClassModel(Option varClass = default) + public ClassModel(Option @class = default) { - VarClassOption = varClass; + ClassOption = @class; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("_class")] - public string VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new Option(value); } } + public string Class { get { return this. ClassOption; } set { this.ClassOption = new Option(value); } } /// /// Gets or Sets additional properties @@ -69,7 +69,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -164,11 +164,11 @@ public override void Write(Utf8JsonWriter writer, ClassModel classModel, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, ClassModel classModel, JsonSerializerOptions jsonSerializerOptions) { - if (classModel.VarClassOption.IsSet && classModel.VarClass == null) - throw new ArgumentNullException(nameof(classModel.VarClass), "Property is required for class ClassModel."); + if (classModel.ClassOption.IsSet && classModel.Class == null) + throw new ArgumentNullException(nameof(classModel.Class), "Property is required for class ClassModel."); - if (classModel.VarClassOption.IsSet) - writer.WriteString("_class", classModel.VarClass); + if (classModel.ClassOption.IsSet) + writer.WriteString("_class", classModel.Class); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 7e6890ba3bf8..a51830ad1a8c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -32,28 +32,28 @@ public partial class FooGetDefaultResponse : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varString + /// string [JsonConstructor] - public FooGetDefaultResponse(Option varString = default) + public FooGetDefaultResponse(Option @string = default) { - VarStringOption = varString; + StringOption = @string; OnCreated(); } partial void OnCreated(); /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public Foo VarString { get { return this. VarStringOption; } set { this.VarStringOption = new Option(value); } } + public Foo String { get { return this. StringOption; } set { this.StringOption = new Option(value); } } /// /// Gets or Sets additional properties @@ -69,7 +69,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -165,13 +165,13 @@ public override void Write(Utf8JsonWriter writer, FooGetDefaultResponse fooGetDe /// public void WriteProperties(ref Utf8JsonWriter writer, FooGetDefaultResponse fooGetDefaultResponse, JsonSerializerOptions jsonSerializerOptions) { - if (fooGetDefaultResponse.VarStringOption.IsSet && fooGetDefaultResponse.VarString == null) - throw new ArgumentNullException(nameof(fooGetDefaultResponse.VarString), "Property is required for class FooGetDefaultResponse."); + if (fooGetDefaultResponse.StringOption.IsSet && fooGetDefaultResponse.String == null) + throw new ArgumentNullException(nameof(fooGetDefaultResponse.String), "Property is required for class FooGetDefaultResponse."); - if (fooGetDefaultResponse.VarStringOption.IsSet) + if (fooGetDefaultResponse.StringOption.IsSet) { writer.WritePropertyName("string"); - JsonSerializer.Serialize(writer, fooGetDefaultResponse.VarString, jsonSerializerOptions); + JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, jsonSerializerOptions); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 29eff0cd769f..33a5d5e6a836 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -32,44 +32,44 @@ public partial class FormatTest : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varByte + /// byte /// date /// number /// password /// binary /// dateTime - /// varDecimal - /// varDouble - /// varFloat + /// decimal + /// double + /// float /// int32 /// int64 /// integer /// None /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. - /// varString + /// string /// unsignedInteger /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(byte[] varByte, DateTime date, decimal number, string password, Option binary = default, Option dateTime = default, Option varDecimal = default, Option varDouble = default, Option varFloat = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option varString = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) + public FormatTest(byte[] @byte, DateTime date, decimal number, string password, Option binary = default, Option dateTime = default, Option @decimal = default, Option @double = default, Option @float = default, Option int32 = default, Option int64 = default, Option integer = default, Option patternWithBackslash = default, Option patternWithDigits = default, Option patternWithDigitsAndDelimiter = default, Option @string = default, Option unsignedInteger = default, Option unsignedLong = default, Option uuid = default) { - VarByte = varByte; + Byte = @byte; Date = date; Number = number; Password = password; BinaryOption = binary; DateTimeOption = dateTime; - VarDecimalOption = varDecimal; - VarDoubleOption = varDouble; - VarFloatOption = varFloat; + DecimalOption = @decimal; + DoubleOption = @double; + FloatOption = @float; Int32Option = int32; Int64Option = int64; IntegerOption = integer; PatternWithBackslashOption = patternWithBackslash; PatternWithDigitsOption = patternWithDigits; PatternWithDigitsAndDelimiterOption = patternWithDigitsAndDelimiter; - VarStringOption = varString; + StringOption = @string; UnsignedIntegerOption = unsignedInteger; UnsignedLongOption = unsignedLong; UuidOption = uuid; @@ -79,10 +79,10 @@ public FormatTest(byte[] varByte, DateTime date, decimal number, string password partial void OnCreated(); /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [JsonPropertyName("byte")] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Date @@ -131,43 +131,43 @@ public FormatTest(byte[] varByte, DateTime date, decimal number, string password public DateTime? DateTime { get { return this. DateTimeOption; } set { this.DateTimeOption = new Option(value); } } /// - /// Used to track the state of VarDecimal + /// Used to track the state of Decimal /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDecimalOption { get; private set; } + public Option DecimalOption { get; private set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [JsonPropertyName("decimal")] - public decimal? VarDecimal { get { return this. VarDecimalOption; } set { this.VarDecimalOption = new Option(value); } } + public decimal? Decimal { get { return this. DecimalOption; } set { this.DecimalOption = new Option(value); } } /// - /// Used to track the state of VarDouble + /// Used to track the state of Double /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarDoubleOption { get; private set; } + public Option DoubleOption { get; private set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [JsonPropertyName("double")] - public double? VarDouble { get { return this. VarDoubleOption; } set { this.VarDoubleOption = new Option(value); } } + public double? Double { get { return this. DoubleOption; } set { this.DoubleOption = new Option(value); } } /// - /// Used to track the state of VarFloat + /// Used to track the state of Float /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarFloatOption { get; private set; } + public Option FloatOption { get; private set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [JsonPropertyName("float")] - public float? VarFloat { get { return this. VarFloatOption; } set { this.VarFloatOption = new Option(value); } } + public float? Float { get { return this. FloatOption; } set { this.FloatOption = new Option(value); } } /// /// Used to track the state of Int32 @@ -251,17 +251,17 @@ public FormatTest(byte[] varByte, DateTime date, decimal number, string password public string PatternWithDigitsAndDelimiter { get { return this. PatternWithDigitsAndDelimiterOption; } set { this.PatternWithDigitsAndDelimiterOption = new Option(value); } } /// - /// Used to track the state of VarString + /// Used to track the state of String /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarStringOption { get; private set; } + public Option StringOption { get; private set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [JsonPropertyName("string")] - public string VarString { get { return this. VarStringOption; } set { this.VarStringOption = new Option(value); } } + public string String { get { return this. StringOption; } set { this.StringOption = new Option(value); } } /// /// Used to track the state of UnsignedInteger @@ -317,22 +317,22 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FormatTest {\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Password: ").Append(Password).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" PatternWithBackslash: ").Append(PatternWithBackslash).Append("\n"); sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); @@ -372,28 +372,28 @@ public override string ToString() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - // VarDouble (double) maximum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value > (double)123.4) + // Double (double) maximum + if (this.DoubleOption.IsSet && this.DoubleOption.Value > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDoubleOption.IsSet && this.VarDoubleOption.Value < (double)67.8) + // Double (double) minimum + if (this.DoubleOption.IsSet && this.DoubleOption.Value < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - // VarFloat (float) maximum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value > (float)987.6) + // Float (float) maximum + if (this.FloatOption.IsSet && this.FloatOption.Value > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloatOption.IsSet && this.VarFloatOption.Value < (float)54.3) + // Float (float) minimum + if (this.FloatOption.IsSet && this.FloatOption.Value < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } // Int32 (int) maximum @@ -450,13 +450,13 @@ public override string ToString() } } - if (this.VarStringOption.Value != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (this.StringOption.Value != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (this.VarStringOption.Value != null &&!regexVarString.Match(this.VarStringOption.Value).Success) + if (this.StringOption.Value != null &&!regexString.Match(this.StringOption.Value).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } @@ -716,8 +716,8 @@ public override void Write(Utf8JsonWriter writer, FormatTest formatTest, JsonSer /// public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, JsonSerializerOptions jsonSerializerOptions) { - if (formatTest.VarByte == null) - throw new ArgumentNullException(nameof(formatTest.VarByte), "Property is required for class FormatTest."); + if (formatTest.Byte == null) + throw new ArgumentNullException(nameof(formatTest.Byte), "Property is required for class FormatTest."); if (formatTest.Password == null) throw new ArgumentNullException(nameof(formatTest.Password), "Property is required for class FormatTest."); @@ -734,11 +734,11 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet && formatTest.PatternWithDigitsAndDelimiter == null) throw new ArgumentNullException(nameof(formatTest.PatternWithDigitsAndDelimiter), "Property is required for class FormatTest."); - if (formatTest.VarStringOption.IsSet && formatTest.VarString == null) - throw new ArgumentNullException(nameof(formatTest.VarString), "Property is required for class FormatTest."); + if (formatTest.StringOption.IsSet && formatTest.String == null) + throw new ArgumentNullException(nameof(formatTest.String), "Property is required for class FormatTest."); writer.WritePropertyName("byte"); - JsonSerializer.Serialize(writer, formatTest.VarByte, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Byte, jsonSerializerOptions); writer.WriteString("date", formatTest.Date.ToString(DateFormat)); writer.WriteNumber("number", formatTest.Number); @@ -753,16 +753,16 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.DateTimeOption.IsSet) writer.WriteString("dateTime", formatTest.DateTimeOption.Value.Value.ToString(DateTimeFormat)); - if (formatTest.VarDecimalOption.IsSet) + if (formatTest.DecimalOption.IsSet) { writer.WritePropertyName("decimal"); - JsonSerializer.Serialize(writer, formatTest.VarDecimal, jsonSerializerOptions); + JsonSerializer.Serialize(writer, formatTest.Decimal, jsonSerializerOptions); } - if (formatTest.VarDoubleOption.IsSet) - writer.WriteNumber("double", formatTest.VarDoubleOption.Value.Value); + if (formatTest.DoubleOption.IsSet) + writer.WriteNumber("double", formatTest.DoubleOption.Value.Value); - if (formatTest.VarFloatOption.IsSet) - writer.WriteNumber("float", formatTest.VarFloatOption.Value.Value); + if (formatTest.FloatOption.IsSet) + writer.WriteNumber("float", formatTest.FloatOption.Value.Value); if (formatTest.Int32Option.IsSet) writer.WriteNumber("int32", formatTest.Int32Option.Value.Value); @@ -782,8 +782,8 @@ public void WriteProperties(ref Utf8JsonWriter writer, FormatTest formatTest, Js if (formatTest.PatternWithDigitsAndDelimiterOption.IsSet) writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); - if (formatTest.VarStringOption.IsSet) - writer.WriteString("string", formatTest.VarString); + if (formatTest.StringOption.IsSet) + writer.WriteString("string", formatTest.String); if (formatTest.UnsignedIntegerOption.IsSet) writer.WriteNumber("unsigned_integer", formatTest.UnsignedIntegerOption.Value.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs index 1ea0d944f050..05e439a9c3e6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -245,11 +245,6 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO { writer.WriteStartObject(); - if (mammal.Pig != null) { - PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); - pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); - } - if (mammal.Whale != null) { WhaleJsonConverter whaleJsonConverter = (WhaleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Whale.GetType())); whaleJsonConverter.WriteProperties(ref writer, mammal.Whale, jsonSerializerOptions); @@ -260,6 +255,11 @@ public override void Write(Utf8JsonWriter writer, Mammal mammal, JsonSerializerO zebraJsonConverter.WriteProperties(ref writer, mammal.Zebra, jsonSerializerOptions); } + if (mammal.Pig != null) { + PigJsonConverter pigJsonConverter = (PigJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(mammal.Pig.GetType())); + pigJsonConverter.WriteProperties(ref writer, mammal.Pig, jsonSerializerOptions); + } + WriteProperties(ref writer, mammal, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs index ba4afe20a018..fe388997446b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -32,12 +32,12 @@ public partial class Model200Response : IValidatableObject /// /// Initializes a new instance of the class. /// - /// varClass + /// class /// name [JsonConstructor] - public Model200Response(Option varClass = default, Option name = default) + public Model200Response(Option @class = default, Option name = default) { - VarClassOption = varClass; + ClassOption = @class; NameOption = name; OnCreated(); } @@ -45,17 +45,17 @@ public Model200Response(Option varClass = default, Option name = d partial void OnCreated(); /// - /// Used to track the state of VarClass + /// Used to track the state of Class /// [JsonIgnore] [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public Option VarClassOption { get; private set; } + public Option ClassOption { get; private set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [JsonPropertyName("class")] - public string VarClass { get { return this. VarClassOption; } set { this.VarClassOption = new Option(value); } } + public string Class { get { return this. ClassOption; } set { this.ClassOption = new Option(value); } } /// /// Used to track the state of Name @@ -84,7 +84,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -188,11 +188,11 @@ public override void Write(Utf8JsonWriter writer, Model200Response model200Respo /// public void WriteProperties(ref Utf8JsonWriter writer, Model200Response model200Response, JsonSerializerOptions jsonSerializerOptions) { - if (model200Response.VarClassOption.IsSet && model200Response.VarClass == null) - throw new ArgumentNullException(nameof(model200Response.VarClass), "Property is required for class Model200Response."); + if (model200Response.ClassOption.IsSet && model200Response.Class == null) + throw new ArgumentNullException(nameof(model200Response.Class), "Property is required for class Model200Response."); - if (model200Response.VarClassOption.IsSet) - writer.WriteString("class", model200Response.VarClass); + if (model200Response.ClassOption.IsSet) + writer.WriteString("class", model200Response.Class); if (model200Response.NameOption.IsSet) writer.WriteNumber("name", model200Response.NameOption.Value.Value); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs index 1e38640c8af9..d66595994262 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, NullableShape nullableShape, J { writer.WriteStartObject(); - if (nullableShape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); - } - if (nullableShape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, nullableShape.Triangle, jsonSerializerOptions); } + if (nullableShape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(nullableShape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, nullableShape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, nullableShape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs index 660604e3ef17..6e94b861b234 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs @@ -121,9 +121,6 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC } } - if (varString != null) - return new OneOfString(varString); - if (varString != null) return new OneOfString(varString); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 2c2227a22512..a973bcddf8c5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -52,10 +52,10 @@ internal PolymorphicProperty(string varString) /// /// Initializes a new instance of the class. /// - /// - internal PolymorphicProperty(Object varObject) + /// + internal PolymorphicProperty(Object @object) { - VarObject = varObject; + Object = @object; OnCreated(); } @@ -82,9 +82,9 @@ internal PolymorphicProperty(List list) public string VarString { get; set; } /// - /// Gets or Sets VarObject + /// Gets or Sets Object /// - public Object VarObject { get; set; } + public Object Object { get; set; } /// /// Gets or Sets List @@ -165,8 +165,8 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString); - Utf8JsonReader utf8JsonReaderVarObject = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarObject, jsonSerializerOptions, out varObject); + Utf8JsonReader utf8JsonReaderObject = utf8JsonReader; + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject); Utf8JsonReader utf8JsonReaderList = utf8JsonReader; OpenAPIClientUtils.TryDeserialize>(ref utf8JsonReaderList, jsonSerializerOptions, out list); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index 3f4034a17713..f3ef21718ae4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, Quadrilateral quadrilateral, J { writer.WriteStartObject(); - if (quadrilateral.ComplexQuadrilateral != null) { - ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); - complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); - } - if (quadrilateral.SimpleQuadrilateral != null) { SimpleQuadrilateralJsonConverter simpleQuadrilateralJsonConverter = (SimpleQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.SimpleQuadrilateral.GetType())); simpleQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.SimpleQuadrilateral, jsonSerializerOptions); } + if (quadrilateral.ComplexQuadrilateral != null) { + ComplexQuadrilateralJsonConverter complexQuadrilateralJsonConverter = (ComplexQuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(quadrilateral.ComplexQuadrilateral.GetType())); + complexQuadrilateralJsonConverter.WriteProperties(ref writer, quadrilateral.ComplexQuadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, quadrilateral, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs index 7ef17db222ff..227de97d2879 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs @@ -32,16 +32,34 @@ public partial class Return : IValidatableObject /// /// Initializes a new instance of the class. /// + /// lock + /// abstract /// varReturn + /// unsafe [JsonConstructor] - public Return(Option varReturn = default) + public Return(string @lock, string @abstract = default, Option varReturn = default, Option @unsafe = default) { + Lock = @lock; + Abstract = @abstract; VarReturnOption = varReturn; + UnsafeOption = @unsafe; OnCreated(); } partial void OnCreated(); + /// + /// Gets or Sets Lock + /// + [JsonPropertyName("lock")] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [JsonPropertyName("abstract")] + public string Abstract { get; set; } + /// /// Used to track the state of VarReturn /// @@ -55,6 +73,19 @@ public Return(Option varReturn = default) [JsonPropertyName("return")] public int? VarReturn { get { return this. VarReturnOption; } set { this.VarReturnOption = new Option(value); } } + /// + /// Used to track the state of Unsafe + /// + [JsonIgnore] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + public Option UnsafeOption { get; private set; } + + /// + /// Gets or Sets Unsafe + /// + [JsonPropertyName("unsafe")] + public string Unsafe { get { return this. UnsafeOption; } set { this.UnsafeOption = new Option(value); } } + /// /// Gets or Sets additional properties /// @@ -69,7 +100,10 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -108,7 +142,10 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver JsonTokenType startingTokenType = utf8JsonReader.TokenType; + Option varLock = default; + Option varAbstract = default; Option varReturn = default; + Option varUnsafe = default; while (utf8JsonReader.Read()) { @@ -125,20 +162,41 @@ public override Return Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver switch (localVarJsonPropertyName) { + case "lock": + varLock = new Option(utf8JsonReader.GetString()); + break; + case "abstract": + varAbstract = new Option(utf8JsonReader.GetString()); + break; case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) varReturn = new Option(utf8JsonReader.GetInt32()); break; + case "unsafe": + varUnsafe = new Option(utf8JsonReader.GetString()); + break; default: break; } } } + if (!varLock.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varLock)); + + if (!varAbstract.IsSet) + throw new ArgumentException("Property is required for class Return.", nameof(varAbstract)); + + if (varLock.IsSet && varLock.Value == null) + throw new ArgumentNullException(nameof(varLock), "Property is not nullable for class Return."); + if (varReturn.IsSet && varReturn.Value == null) throw new ArgumentNullException(nameof(varReturn), "Property is not nullable for class Return."); - return new Return(varReturn); + if (varUnsafe.IsSet && varUnsafe.Value == null) + throw new ArgumentNullException(nameof(varUnsafe), "Property is not nullable for class Return."); + + return new Return(varLock.Value, varAbstract.Value, varReturn, varUnsafe); } /// @@ -165,8 +223,24 @@ public override void Write(Utf8JsonWriter writer, Return varReturn, JsonSerializ /// public void WriteProperties(ref Utf8JsonWriter writer, Return varReturn, JsonSerializerOptions jsonSerializerOptions) { + if (varReturn.Lock == null) + throw new ArgumentNullException(nameof(varReturn.Lock), "Property is required for class Return."); + + if (varReturn.UnsafeOption.IsSet && varReturn.Unsafe == null) + throw new ArgumentNullException(nameof(varReturn.Unsafe), "Property is required for class Return."); + + writer.WriteString("lock", varReturn.Lock); + + if (varReturn.Abstract != null) + writer.WriteString("abstract", varReturn.Abstract); + else + writer.WriteNull("abstract"); + if (varReturn.VarReturnOption.IsSet) writer.WriteNumber("return", varReturn.VarReturnOption.Value.Value); + + if (varReturn.UnsafeOption.IsSet) + writer.WriteString("unsafe", varReturn.Unsafe); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs index 575069f242e0..ffd95a8fdff1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, Shape shape, JsonSerializerOpt { writer.WriteStartObject(); - if (shape.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); - } - if (shape.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shape.Triangle, jsonSerializerOptions); } + if (shape.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shape.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shape.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shape, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index a26dab034230..d60f396c70da 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -219,16 +219,16 @@ public override void Write(Utf8JsonWriter writer, ShapeOrNull shapeOrNull, JsonS { writer.WriteStartObject(); - if (shapeOrNull.Quadrilateral != null) { - QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); - quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); - } - if (shapeOrNull.Triangle != null) { TriangleJsonConverter triangleJsonConverter = (TriangleJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Triangle.GetType())); triangleJsonConverter.WriteProperties(ref writer, shapeOrNull.Triangle, jsonSerializerOptions); } + if (shapeOrNull.Quadrilateral != null) { + QuadrilateralJsonConverter quadrilateralJsonConverter = (QuadrilateralJsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert(shapeOrNull.Quadrilateral.GetType())); + quadrilateralJsonConverter.WriteProperties(ref writer, shapeOrNull.Quadrilateral, jsonSerializerOptions); + } + WriteProperties(ref writer, shapeOrNull, jsonSerializerOptions); writer.WriteEndObject(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-httpclient/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md index dd68009f6dc9..7c06c37839c3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | [**FileParameter**](FileParameter.md) | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md index 052ac9190068..a10daf95cf1d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md @@ -6,6 +6,9 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **VarReturn** | **int** | | [optional] +**Lock** | **string** | | +**Abstract** | **string** | | +**Unsafe** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs index 04fdc54204cc..385c0f087a8c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs @@ -39,15 +39,15 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -63,7 +63,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -107,9 +107,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 3ff42d399d26..e491ad5a235b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -39,15 +39,15 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Gets or Sets additional properties @@ -63,7 +63,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -107,9 +107,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs index 0bd9d03d007a..ebaad5a1e0d0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -71,7 +71,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; this.Date = date; // to ensure "password" is required (not null) if (password == null) @@ -84,10 +84,10 @@ protected FormatTest() this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -134,34 +134,34 @@ protected FormatTest() public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -238,11 +238,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -300,16 +300,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -406,36 +406,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs index 8f1a27924975..284b5b4f6e35 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs @@ -41,7 +41,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } @@ -52,10 +52,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -72,7 +72,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -117,9 +117,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs index b6f903f78d59..f85c7ed35e7b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs @@ -33,13 +33,37 @@ namespace Org.OpenAPITools.Model [DataContract(Name = "Return")] public partial class Return : IEquatable, IValidatableObject { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Return() + { + this.AdditionalProperties = new Dictionary(); + } /// /// Initializes a new instance of the class. /// /// varReturn. - public Return(int varReturn = default(int)) + /// varLock (required). + /// varAbstract (required). + /// varUnsafe. + public Return(int varReturn = default(int), string varLock = default(string), string varAbstract = default(string), string varUnsafe = default(string)) { + // to ensure "varLock" is required (not null) + if (varLock == null) + { + throw new ArgumentNullException("varLock is a required property for Return and cannot be null"); + } + this.Lock = varLock; + // to ensure "varAbstract" is required (not null) + if (varAbstract == null) + { + throw new ArgumentNullException("varAbstract is a required property for Return and cannot be null"); + } + this.Abstract = varAbstract; this.VarReturn = varReturn; + this.Unsafe = varUnsafe; this.AdditionalProperties = new Dictionary(); } @@ -49,6 +73,24 @@ public partial class Return : IEquatable, IValidatableObject [DataMember(Name = "return", EmitDefaultValue = false)] public int VarReturn { get; set; } + /// + /// Gets or Sets Lock + /// + [DataMember(Name = "lock", IsRequired = true, EmitDefaultValue = true)] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [DataMember(Name = "abstract", IsRequired = true, EmitDefaultValue = true)] + public string Abstract { get; set; } + + /// + /// Gets or Sets Unsafe + /// + [DataMember(Name = "unsafe", EmitDefaultValue = false)] + public string Unsafe { get; set; } + /// /// Gets or Sets additional properties /// @@ -64,6 +106,9 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -108,6 +153,18 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.VarReturn.GetHashCode(); + if (this.Lock != null) + { + hashCode = (hashCode * 59) + this.Lock.GetHashCode(); + } + if (this.Abstract != null) + { + hashCode = (hashCode * 59) + this.Abstract.GetHashCode(); + } + if (this.Unsafe != null) + { + hashCode = (hashCode * 59) + this.Unsafe.GetHashCode(); + } if (this.AdditionalProperties != null) { hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-net47/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md index 2d28c89fa309..c2144b5e3cf6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs index 19aedc1734bf..61119cfffe03 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,15 +38,15 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 55cd8eb74820..fbed359747ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,15 +38,15 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs index 8a1f7d62fa27..58d398101c84 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs @@ -70,7 +70,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; this.Date = date; // to ensure "password" is required (not null) if (password == null) @@ -83,10 +83,10 @@ protected FormatTest() this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -133,34 +133,34 @@ protected FormatTest() public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -237,11 +237,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -299,16 +299,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -405,36 +405,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs index 6e5acdf9e693..b5046d917fd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs @@ -40,7 +40,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } @@ -51,10 +51,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -116,9 +116,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-net48/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md index 2d28c89fa309..c2144b5e3cf6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs index 19aedc1734bf..61119cfffe03 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,15 +38,15 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 55cd8eb74820..fbed359747ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,15 +38,15 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs index 8a1f7d62fa27..58d398101c84 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs @@ -70,7 +70,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; this.Date = date; // to ensure "password" is required (not null) if (password == null) @@ -83,10 +83,10 @@ protected FormatTest() this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -133,34 +133,34 @@ protected FormatTest() public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -237,11 +237,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -299,16 +299,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -405,36 +405,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs index 6e5acdf9e693..b5046d917fd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs @@ -40,7 +40,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } @@ -51,10 +51,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -116,9 +116,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md index 1d09c0f37e47..14efa7b0f63e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateOnly** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs index 19aedc1734bf..61119cfffe03 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,15 +38,15 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 55cd8eb74820..fbed359747ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,15 +38,15 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs index e797509b92d5..80756709cdac 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -70,7 +70,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; // to ensure "date" is required (not null) if (date == null) { @@ -88,10 +88,10 @@ protected FormatTest() this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -138,34 +138,34 @@ protected FormatTest() public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -242,11 +242,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -304,16 +304,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -410,36 +410,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs index 6e5acdf9e693..b5046d917fd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -40,7 +40,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } @@ -51,10 +51,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -116,9 +116,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient-unityWebRequest/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md index 2d28c89fa309..c2144b5e3cf6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md index 052ac9190068..a10daf95cf1d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md @@ -6,6 +6,9 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **VarReturn** | **int** | | [optional] +**Lock** | **string** | | +**Abstract** | **string** | | +**Unsafe** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs index d285902263fe..d0b3dd330925 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs @@ -36,14 +36,14 @@ public partial class ClassModel : IEquatable /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Returns the string presentation of the object @@ -53,7 +53,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -90,9 +90,9 @@ public bool Equals(ClassModel input) } return ( - this.VarClass == input.VarClass || - (this.VarClass != null && - this.VarClass.Equals(input.VarClass)) + this.Class == input.Class || + (this.Class != null && + this.Class.Equals(input.Class)) ); } @@ -105,9 +105,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 3ff0307c7b5a..7e6349d03c81 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -36,14 +36,14 @@ public partial class FooGetDefaultResponse : IEquatable /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Returns the string presentation of the object @@ -53,7 +53,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -90,9 +90,9 @@ public bool Equals(FooGetDefaultResponse input) } return ( - this.VarString == input.VarString || - (this.VarString != null && - this.VarString.Equals(input.VarString)) + this.String == input.String || + (this.String != null && + this.String.Equals(input.String)) ); } @@ -105,9 +105,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs index 8c3e615c68d3..58e9af3d2490 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs @@ -65,7 +65,7 @@ protected FormatTest() { } { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; this.Date = date; // to ensure "password" is required (not null) if (password == null) @@ -78,10 +78,10 @@ protected FormatTest() { } this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -127,34 +127,34 @@ protected FormatTest() { } public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -225,11 +225,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -298,26 +298,26 @@ public bool Equals(FormatTest input) this.Number.Equals(input.Number) ) && ( - this.VarFloat == input.VarFloat || - this.VarFloat.Equals(input.VarFloat) + this.Float == input.Float || + this.Float.Equals(input.Float) ) && ( - this.VarDouble == input.VarDouble || - this.VarDouble.Equals(input.VarDouble) + this.Double == input.Double || + this.Double.Equals(input.Double) ) && ( - this.VarDecimal == input.VarDecimal || - this.VarDecimal.Equals(input.VarDecimal) + this.Decimal == input.Decimal || + this.Decimal.Equals(input.Decimal) ) && ( - this.VarString == input.VarString || - (this.VarString != null && - this.VarString.Equals(input.VarString)) + this.String == input.String || + (this.String != null && + this.String.Equals(input.String)) ) && ( - this.VarByte == input.VarByte || - (this.VarByte != null && - this.VarByte.Equals(input.VarByte)) + this.Byte == input.Byte || + (this.Byte != null && + this.Byte.Equals(input.Byte)) ) && ( this.Binary == input.Binary || @@ -376,16 +376,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs index f11a854f1495..5ebae913605a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs @@ -38,7 +38,7 @@ public partial class Model200Response : IEquatable public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; } /// @@ -48,10 +48,10 @@ public partial class Model200Response : IEquatable public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Returns the string presentation of the object @@ -62,7 +62,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -103,9 +103,9 @@ public bool Equals(Model200Response input) this.Name.Equals(input.Name) ) && ( - this.VarClass == input.VarClass || - (this.VarClass != null && - this.VarClass.Equals(input.VarClass)) + this.Class == input.Class || + (this.Class != null && + this.Class.Equals(input.Class)) ); } @@ -119,9 +119,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs index 53eb03312077..e878ddab0b92 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs @@ -30,13 +30,34 @@ namespace Org.OpenAPITools.Model [DataContract(Name = "Return")] public partial class Return : IEquatable { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Return() { } /// /// Initializes a new instance of the class. /// /// varReturn. - public Return(int varReturn = default(int)) + /// varLock (required). + /// varAbstract (required). + /// varUnsafe. + public Return(int varReturn = default(int), string varLock = default(string), string varAbstract = default(string), string varUnsafe = default(string)) { + // to ensure "varLock" is required (not null) + if (varLock == null) + { + throw new ArgumentNullException("varLock is a required property for Return and cannot be null"); + } + this.Lock = varLock; + // to ensure "varAbstract" is required (not null) + if (varAbstract == null) + { + throw new ArgumentNullException("varAbstract is a required property for Return and cannot be null"); + } + this.Abstract = varAbstract; this.VarReturn = varReturn; + this.Unsafe = varUnsafe; } /// @@ -45,6 +66,24 @@ public partial class Return : IEquatable [DataMember(Name = "return", EmitDefaultValue = false)] public int VarReturn { get; set; } + /// + /// Gets or Sets Lock + /// + [DataMember(Name = "lock", IsRequired = true, EmitDefaultValue = true)] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [DataMember(Name = "abstract", IsRequired = true, EmitDefaultValue = true)] + public string Abstract { get; set; } + + /// + /// Gets or Sets Unsafe + /// + [DataMember(Name = "unsafe", EmitDefaultValue = false)] + public string Unsafe { get; set; } + /// /// Returns the string presentation of the object /// @@ -54,6 +93,9 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -92,6 +134,21 @@ public bool Equals(Return input) ( this.VarReturn == input.VarReturn || this.VarReturn.Equals(input.VarReturn) + ) && + ( + this.Lock == input.Lock || + (this.Lock != null && + this.Lock.Equals(input.Lock)) + ) && + ( + this.Abstract == input.Abstract || + (this.Abstract != null && + this.Abstract.Equals(input.Abstract)) + ) && + ( + this.Unsafe == input.Unsafe || + (this.Unsafe != null && + this.Unsafe.Equals(input.Unsafe)) ); } @@ -105,6 +162,18 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.VarReturn.GetHashCode(); + if (this.Lock != null) + { + hashCode = (hashCode * 59) + this.Lock.GetHashCode(); + } + if (this.Abstract != null) + { + hashCode = (hashCode * 59) + this.Abstract.GetHashCode(); + } + if (this.Unsafe != null) + { + hashCode = (hashCode * 59) + this.Unsafe.GetHashCode(); + } return hashCode; } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md index 2d28c89fa309..c2144b5e3cf6 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateTime** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **string** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs index 19aedc1734bf..61119cfffe03 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,15 +38,15 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 55cd8eb74820..fbed359747ae 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,15 +38,15 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; this.AdditionalProperties = new Dictionary(); } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Gets or Sets additional properties @@ -62,7 +62,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -106,9 +106,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs index 8a1f7d62fa27..58d398101c84 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -70,7 +70,7 @@ protected FormatTest() { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; this.Date = date; // to ensure "password" is required (not null) if (password == null) @@ -83,10 +83,10 @@ protected FormatTest() this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -133,34 +133,34 @@ protected FormatTest() public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -237,11 +237,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -299,16 +299,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -405,36 +405,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs index 6e5acdf9e693..b5046d917fd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs @@ -40,7 +40,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; this.AdditionalProperties = new Dictionary(); } @@ -51,10 +51,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Gets or Sets additional properties @@ -71,7 +71,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); return sb.ToString(); @@ -116,9 +116,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } if (this.AdditionalProperties != null) { diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml index 1845b502818e..a7e5643fd01c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml +++ b/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml @@ -1490,6 +1490,16 @@ components: return: format: int32 type: integer + lock: + type: string + abstract: + nullable: true + type: string + unsafe: + type: string + required: + - abstract + - lock xml: name: Return Name: diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md index c90a44a6f84d..f39982657c89 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md @@ -5,7 +5,7 @@ Model for testing model with \"_class\" property Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarClass** | **string** | | [optional] +**Class** | **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/OpenAPIClientCore/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md index 9ebee8279490..dde9b9729b93 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**VarString** | [**Foo**](Foo.md) | | [optional] +**String** | [**Foo**](Foo.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/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md index 1d09c0f37e47..14efa7b0f63e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md @@ -10,11 +10,11 @@ Name | Type | Description | Notes **Int64** | **long** | | [optional] **UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | -**VarFloat** | **float** | | [optional] -**VarDouble** | **double** | | [optional] -**VarDecimal** | **decimal** | | [optional] -**VarString** | **string** | | [optional] -**VarByte** | **byte[]** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | **Binary** | **System.IO.Stream** | | [optional] **Date** | **DateOnly** | | **DateTime** | **DateTime** | | [optional] diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md index 4b6338af4243..31f4d86fe43d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md @@ -6,7 +6,7 @@ Model for testing model name starting with number Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Name** | **int** | | [optional] -**VarClass** | **string** | | [optional] +**Class** | **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/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md index 052ac9190068..a10daf95cf1d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md @@ -6,6 +6,9 @@ Model for testing reserved words Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **VarReturn** | **int** | | [optional] +**Lock** | **string** | | +**Abstract** | **string** | | +**Unsafe** | **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/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs index 6654d1c2ee5a..044376ac8189 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs @@ -38,14 +38,14 @@ public partial class ClassModel : IEquatable, IValidatableObject /// varClass. public ClassModel(string varClass = default(string)) { - this.VarClass = varClass; + this.Class = varClass; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "_class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Returns the string presentation of the object @@ -55,7 +55,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class ClassModel {\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -98,9 +98,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 50b08ea97bcb..b1f469b334c6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -38,14 +38,14 @@ public partial class FooGetDefaultResponse : IEquatable, /// varString. public FooGetDefaultResponse(Foo varString = default(Foo)) { - this.VarString = varString; + this.String = varString; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public Foo VarString { get; set; } + public Foo String { get; set; } /// /// Returns the string presentation of the object @@ -55,7 +55,7 @@ public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("class FooGetDefaultResponse {\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -98,9 +98,9 @@ public override int GetHashCode() unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.VarString != null) + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index 082635330ade..6e53c5793795 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -67,7 +67,7 @@ protected FormatTest() { } { throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null"); } - this.VarByte = varByte; + this.Byte = varByte; // to ensure "date" is required (not null) if (date == null) { @@ -85,10 +85,10 @@ protected FormatTest() { } this.UnsignedInteger = unsignedInteger; this.Int64 = int64; this.UnsignedLong = unsignedLong; - this.VarFloat = varFloat; - this.VarDouble = varDouble; - this.VarDecimal = varDecimal; - this.VarString = varString; + this.Float = varFloat; + this.Double = varDouble; + this.Decimal = varDecimal; + this.String = varString; this.Binary = binary; this.DateTime = dateTime; this.Uuid = uuid; @@ -134,34 +134,34 @@ protected FormatTest() { } public decimal Number { get; set; } /// - /// Gets or Sets VarFloat + /// Gets or Sets Float /// [DataMember(Name = "float", EmitDefaultValue = false)] - public float VarFloat { get; set; } + public float Float { get; set; } /// - /// Gets or Sets VarDouble + /// Gets or Sets Double /// [DataMember(Name = "double", EmitDefaultValue = false)] - public double VarDouble { get; set; } + public double Double { get; set; } /// - /// Gets or Sets VarDecimal + /// Gets or Sets Decimal /// [DataMember(Name = "decimal", EmitDefaultValue = false)] - public decimal VarDecimal { get; set; } + public decimal Decimal { get; set; } /// - /// Gets or Sets VarString + /// Gets or Sets String /// [DataMember(Name = "string", EmitDefaultValue = false)] - public string VarString { get; set; } + public string String { get; set; } /// - /// Gets or Sets VarByte + /// Gets or Sets Byte /// [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] - public byte[] VarByte { get; set; } + public byte[] Byte { get; set; } /// /// Gets or Sets Binary @@ -232,11 +232,11 @@ public override string ToString() sb.Append(" Int64: ").Append(Int64).Append("\n"); sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); - sb.Append(" VarFloat: ").Append(VarFloat).Append("\n"); - sb.Append(" VarDouble: ").Append(VarDouble).Append("\n"); - sb.Append(" VarDecimal: ").Append(VarDecimal).Append("\n"); - sb.Append(" VarString: ").Append(VarString).Append("\n"); - sb.Append(" VarByte: ").Append(VarByte).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); sb.Append(" Binary: ").Append(Binary).Append("\n"); sb.Append(" Date: ").Append(Date).Append("\n"); sb.Append(" DateTime: ").Append(DateTime).Append("\n"); @@ -293,16 +293,16 @@ public override int GetHashCode() hashCode = (hashCode * 59) + this.Int64.GetHashCode(); hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); - hashCode = (hashCode * 59) + this.VarFloat.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDouble.GetHashCode(); - hashCode = (hashCode * 59) + this.VarDecimal.GetHashCode(); - if (this.VarString != null) + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) { - hashCode = (hashCode * 59) + this.VarString.GetHashCode(); + hashCode = (hashCode * 59) + this.String.GetHashCode(); } - if (this.VarByte != null) + if (this.Byte != null) { - hashCode = (hashCode * 59) + this.VarByte.GetHashCode(); + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); } if (this.Binary != null) { @@ -395,36 +395,36 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } - // VarFloat (float) maximum - if (this.VarFloat > (float)987.6) + // Float (float) maximum + if (this.Float > (float)987.6) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value less than or equal to 987.6.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" }); } - // VarFloat (float) minimum - if (this.VarFloat < (float)54.3) + // Float (float) minimum + if (this.Float < (float)54.3) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarFloat, must be a value greater than or equal to 54.3.", new [] { "VarFloat" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } - // VarDouble (double) maximum - if (this.VarDouble > (double)123.4) + // Double (double) maximum + if (this.Double > (double)123.4) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value less than or equal to 123.4.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" }); } - // VarDouble (double) minimum - if (this.VarDouble < (double)67.8) + // Double (double) minimum + if (this.Double < (double)67.8) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarDouble, must be a value greater than or equal to 67.8.", new [] { "VarDouble" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } - if (this.VarString != null) { - // VarString (string) pattern - Regex regexVarString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); - if (!regexVarString.Match(this.VarString).Success) + if (this.String != null) { + // String (string) pattern + Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + if (!regexString.Match(this.String).Success) { - yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VarString, must match a pattern of " + regexVarString, new [] { "VarString" }); + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } } diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs index dbf6478540cb..bddc2e77666c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs @@ -40,7 +40,7 @@ public partial class Model200Response : IEquatable, IValidatab public Model200Response(int name = default(int), string varClass = default(string)) { this.Name = name; - this.VarClass = varClass; + this.Class = varClass; } /// @@ -50,10 +50,10 @@ public partial class Model200Response : IEquatable, IValidatab public int Name { get; set; } /// - /// Gets or Sets VarClass + /// Gets or Sets Class /// [DataMember(Name = "class", EmitDefaultValue = false)] - public string VarClass { get; set; } + public string Class { get; set; } /// /// Returns the string presentation of the object @@ -64,7 +64,7 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Model200Response {\n"); sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" VarClass: ").Append(VarClass).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -108,9 +108,9 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.Name.GetHashCode(); - if (this.VarClass != null) + if (this.Class != null) { - hashCode = (hashCode * 59) + this.VarClass.GetHashCode(); + hashCode = (hashCode * 59) + this.Class.GetHashCode(); } return hashCode; } diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs index 867a93f83e99..354376dd0370 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs @@ -32,13 +32,34 @@ namespace Org.OpenAPITools.Model [DataContract(Name = "Return")] public partial class Return : IEquatable, IValidatableObject { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Return() { } /// /// Initializes a new instance of the class. /// /// varReturn. - public Return(int varReturn = default(int)) + /// varLock (required). + /// varAbstract (required). + /// varUnsafe. + public Return(int varReturn = default(int), string varLock = default(string), string varAbstract = default(string), string varUnsafe = default(string)) { + // to ensure "varLock" is required (not null) + if (varLock == null) + { + throw new ArgumentNullException("varLock is a required property for Return and cannot be null"); + } + this.Lock = varLock; + // to ensure "varAbstract" is required (not null) + if (varAbstract == null) + { + throw new ArgumentNullException("varAbstract is a required property for Return and cannot be null"); + } + this.Abstract = varAbstract; this.VarReturn = varReturn; + this.Unsafe = varUnsafe; } /// @@ -47,6 +68,24 @@ public partial class Return : IEquatable, IValidatableObject [DataMember(Name = "return", EmitDefaultValue = false)] public int VarReturn { get; set; } + /// + /// Gets or Sets Lock + /// + [DataMember(Name = "lock", IsRequired = true, EmitDefaultValue = true)] + public string Lock { get; set; } + + /// + /// Gets or Sets Abstract + /// + [DataMember(Name = "abstract", IsRequired = true, EmitDefaultValue = true)] + public string Abstract { get; set; } + + /// + /// Gets or Sets Unsafe + /// + [DataMember(Name = "unsafe", EmitDefaultValue = false)] + public string Unsafe { get; set; } + /// /// Returns the string presentation of the object /// @@ -56,6 +95,9 @@ public override string ToString() StringBuilder sb = new StringBuilder(); sb.Append("class Return {\n"); sb.Append(" VarReturn: ").Append(VarReturn).Append("\n"); + sb.Append(" Lock: ").Append(Lock).Append("\n"); + sb.Append(" Abstract: ").Append(Abstract).Append("\n"); + sb.Append(" Unsafe: ").Append(Unsafe).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -99,6 +141,18 @@ public override int GetHashCode() { int hashCode = 41; hashCode = (hashCode * 59) + this.VarReturn.GetHashCode(); + if (this.Lock != null) + { + hashCode = (hashCode * 59) + this.Lock.GetHashCode(); + } + if (this.Abstract != null) + { + hashCode = (hashCode * 59) + this.Abstract.GetHashCode(); + } + if (this.Unsafe != null) + { + hashCode = (hashCode * 59) + this.Unsafe.GetHashCode(); + } return hashCode; } }