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 c8e08476421..a364d2cec72 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 @@ -765,19 +765,6 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } } - - // check if the payload is json and set x-is-json accordingly - if (operation.consumes != null) { - for (Map consume : operation.consumes) { - if (consume.containsKey("mediaType")) { - if (isJsonMimeType(consume.get("mediaType"))) { - operation.vendorExtensions.put("x-is-json", true); - break; - } - } - } - } - if (operation.examples != null) { for (Map example : operation.examples) { for (Map.Entry entry : example.entrySet()) { @@ -863,8 +850,6 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } private void patchParameter(CodegenParameter parameter, List allModels) { - parameter.paramName = escapeReservedWord(parameter.paramName); - patchVendorExtensionNullableValueType(parameter); if (this.getNullableReferencesTypes() || (parameter.vendorExtensions.get("x-nullable-value-type") != null)) { @@ -1014,7 +999,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // pet_id => petId name = camelize(name, LOWERCASE_FIRST_LETTER); - return name; + return escapeReservedWord(name); } public String escapeReservedWord(CodegenModel model, String name) { diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md index f2bf397505d..9c646838c3d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md index 82106bd5206..c21c791fe24 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md @@ -846,7 +846,7 @@ namespace Example var integer = 56; // int | None (optional) var int32 = 56; // int | None (optional) var int64 = 789L; // long | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var password = "password_example"; // string | None (optional) var callback = "callback_example"; // string | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md index 82106bd5206..c21c791fe24 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md @@ -846,7 +846,7 @@ namespace Example var integer = 56; // int | None (optional) var int32 = 56; // int | None (optional) var int64 = 789L; // long | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var password = "password_example"; // string | None (optional) var callback = "callback_example"; // string | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md index 82106bd5206..c21c791fe24 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md @@ -846,7 +846,7 @@ namespace Example var integer = 56; // int | None (optional) var int32 = 56; // int | None (optional) var int64 = 789L; // long | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var password = "password_example"; // string | None (optional) var callback = "callback_example"; // string | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md index 179bd712636..af0db86acfe 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md @@ -884,7 +884,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // FileParameter | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md index f2bf397505d..9c646838c3d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md index f2bf397505d..9c646838c3d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md index 575453fad06..7d94cce2029 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string? | None (optional) + var varString = "varString_example"; // string? | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream? | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md index f2bf397505d..9c646838c3d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md index f2bf397505d..9c646838c3d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string | None (optional) + var varString = "varString_example"; // string | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md index 575453fad06..7d94cce2029 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md @@ -844,7 +844,7 @@ namespace Example var int32 = 56; // int? | None (optional) var int64 = 789L; // long? | None (optional) var varFloat = 3.4F; // float? | None (optional) - var varString = "string_example"; // string? | None (optional) + var varString = "varString_example"; // string? | None (optional) var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream? | None (optional) var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00")