fixed duplicate property names

Author: devhl-labs

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -625,10 +625,11 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
 
             CodegenComposedSchemas composedSchemas = model.getComposedSchemas();
             if (composedSchemas != null) {
+                Set<String> composedPropertyNames = new HashSet<String>();
                 List<CodegenProperty> allOf = composedSchemas.getAllOf();
                 if (allOf != null) {
                     for (CodegenProperty property : allOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, camelize(property.baseType), composedPropertyNames);
                         patchPropertyVendorExtensions(property);
                     }
                 }
@@ -637,7 +638,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 if (anyOf != null) {
                     removePropertiesDeclaredInComposedTypes(objs, model, anyOf);
                     for (CodegenProperty property : anyOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, camelize(property.baseType), composedPropertyNames);
                         property.isNullable = true;
                         patchPropertyVendorExtensions(property);
                         property.vendorExtensions.put("x-base-name", model.name.substring(model.name.lastIndexOf('_') + 1));
@@ -648,7 +649,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 if (oneOf != null) {
                     removePropertiesDeclaredInComposedTypes(objs, model, oneOf);
                     for (CodegenProperty property : oneOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, camelize(property.baseType), composedPropertyNames);
                         property.isNullable = true;
                         patchPropertyVendorExtensions(property);
                         property.vendorExtensions.put("x-base-name", model.name.substring(model.name.lastIndexOf('_') + 1));
@@ -715,13 +716,27 @@ private boolean modelIsMutable(CodegenModel model, Set<String> processed) {
     protected void removePropertiesDeclaredInComposedTypes(Map<String, ModelsMap> objs, CodegenModel model, List<CodegenProperty> composedProperties) {
     }
 
-    private String patchPropertyName(CodegenModel model, String value) {
+    private String patchPropertyName(CodegenModel model, String value, Set<String> composedPropertyNames) {
         String name = escapeReservedWord(model, value);
 
         if (name.startsWith(AbstractCSharpCodegen.invalidParameterNamePrefix)) {
             name = AbstractCSharpCodegen.invalidPropertyNamePrefix + name.substring(AbstractCSharpCodegen.invalidParameterNamePrefix.length());
         }
 
+        // ensure the name we use for a composed property does not already exist as a property or composed property
+        // only do this if the set of composed property names was provided to ensure this method is idempotent
+        // we would not calling this method multiple times to result in different values
+        if (composedPropertyNames != null) {
+            String tmpName = name;
+            long count = model.allVars.stream().map(v -> v.name).filter(n -> n.equals(tmpName)).count() + composedPropertyNames.stream().filter(n -> n.equals(tmpName)).count();
+
+            if (count > 0) {
+                name = name + count++;
+            }
+
+            composedPropertyNames.add(name);
+        }
+
         return name;
     }
 
@@ -753,7 +768,7 @@ protected void patchProperty(Map<String, CodegenModel> enumRefs, CodegenModel mo
 
         patchPropertyVendorExtensions(property);
 
-        property.name = patchPropertyName(model, property.name);
+        property.name = patchPropertyName(model, property.name, null);
 
         String[] nestedTypes = {"List", "Collection", "ICollection", "Dictionary"};
 

modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

@@ -17,6 +17,24 @@ tags:
   - name: user
     description: Operations about user
 paths:
+  /one-of-array:
+    post:
+      description: Oneof array test
+      operationId: oneOfArray
+      requestBody:
+        content:
+          application/json:
+            schema:
+              oneOf:
+              - items:
+                  type: string
+                type: array
+              - items:
+                  $ref: '#/components/schemas/TestObject'
+                type: array
+      responses:
+        "204":
+          description: Successful operation
   /roles/report:
     get:
       responses:
@@ -2929,3 +2947,8 @@ components:
       enum:
         - APPROVED
         - MANUAL_APPROVAL_REQUIRED
+    TestObject:
+      properties:
+        name:
+          type: string
+      type: object

samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES

@@ -81,6 +81,7 @@ docs/models/NullableGuidClass.md
 docs/models/NullableShape.md
 docs/models/NumberOnly.md
 docs/models/ObjectWithDeprecatedFields.md
+docs/models/OneOfArrayRequest.md
 docs/models/OneOfString.md
 docs/models/Order.md
 docs/models/OrderStatus.md
@@ -126,6 +127,7 @@ docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
+docs/models/TestObject.md
 docs/models/TestResult.md
 docs/models/TestResultCode.md
 docs/models/Triangle.md
@@ -246,6 +248,7 @@ src/Org.OpenAPITools/Model/NullableGuidClass.cs
 src/Org.OpenAPITools/Model/NullableShape.cs
 src/Org.OpenAPITools/Model/NumberOnly.cs
 src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+src/Org.OpenAPITools/Model/OneOfArrayRequest.cs
 src/Org.OpenAPITools/Model/OneOfString.cs
 src/Org.OpenAPITools/Model/Order.cs
 src/Org.OpenAPITools/Model/OrderStatus.cs
@@ -291,6 +294,7 @@ src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
+src/Org.OpenAPITools/Model/TestObject.cs
 src/Org.OpenAPITools/Model/TestResult.cs
 src/Org.OpenAPITools/Model/TestResultCode.cs
 src/Org.OpenAPITools/Model/Triangle.cs

samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml

@@ -41,6 +41,18 @@ tags:
 - description: Operations about user
   name: user
 paths:
+  /one-of-array:
+    post:
+      description: Oneof array test
+      operationId: oneOfArray
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/oneOfArray_request'
+      responses:
+        "204":
+          description: Successful operation
   /roles/report:
     get:
       responses:
@@ -2682,6 +2694,19 @@ components:
       - APPROVED
       - MANUAL_APPROVAL_REQUIRED
       type: string
+    TestObject:
+      properties:
+        name:
+          type: string
+      type: object
+    oneOfArray_request:
+      oneOf:
+      - items:
+          type: string
+        type: array
+      - items:
+          $ref: '#/components/schemas/TestObject'
+        type: array
     _foo_get_default_response:
       example:
         string:

samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/DefaultApi.md

@@ -7,6 +7,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo |  |
 | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country |  |
 | [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello |
+| [**OneOfArray**](DefaultApi.md#oneofarray) | **POST** /one-of-array |  |
 | [**RolesReportGet**](DefaultApi.md#rolesreportget) | **GET** /roles/report |  |
 | [**Test**](DefaultApi.md#test) | **GET** /test | Retrieve an existing Notificationtest's Elements |
 
@@ -261,6 +262,91 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
 
+<a id="oneofarray"></a>
+# **OneOfArray**
+> void OneOfArray (OneOfArrayRequest oneOfArrayRequest = null)
+
+
+
+Oneof array test
+
+### Example
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class OneOfArrayExample
+    {
+        public static void Main()
+        {
+            Configuration config = new Configuration();
+            config.BasePath = "http://petstore.swagger.io:80/v2";
+            var apiInstance = new DefaultApi(config);
+            var oneOfArrayRequest = new OneOfArrayRequest(); // OneOfArrayRequest |  (optional) 
+
+            try
+            {
+                apiInstance.OneOfArray(oneOfArrayRequest);
+            }
+            catch (ApiException  e)
+            {
+                Debug.Print("Exception when calling DefaultApi.OneOfArray: " + e.Message);
+                Debug.Print("Status Code: " + e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+        }
+    }
+}
+```
+
+#### Using the OneOfArrayWithHttpInfo variant
+This returns an ApiResponse object which contains the response data, status code and headers.
+
+```csharp
+try
+{
+    apiInstance.OneOfArrayWithHttpInfo(oneOfArrayRequest);
+}
+catch (ApiException e)
+{
+    Debug.Print("Exception when calling DefaultApi.OneOfArrayWithHttpInfo: " + e.Message);
+    Debug.Print("Status Code: " + e.ErrorCode);
+    Debug.Print(e.StackTrace);
+}
+```
+
+### Parameters
+
+| Name | Type | Description | Notes |
+|------|------|-------------|-------|
+| **oneOfArrayRequest** | [**OneOfArrayRequest**](OneOfArrayRequest.md) |  | [optional]  |
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
+
 <a id="rolesreportget"></a>
 # **RolesReportGet**
 > List&lt;List&lt;RolesReportsHash&gt;&gt; RolesReportGet ()

samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/OneOfArrayRequest.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.OneOfArrayRequest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+

samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestObject.md

@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.TestObject
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **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)
+

samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs

@@ -82,6 +82,16 @@ public async Task HelloAsyncTest()
             Assert.IsType<List<Guid>>(model);
         }
 
+        /// <summary>
+        /// Test OneOfArray
+        /// </summary>
+        [Fact (Skip = "not implemented")]
+        public async Task OneOfArrayAsyncTest()
+        {
+            Client.Option<OneOfArrayRequest> oneOfArrayRequest = default;
+            await _instance.OneOfArrayAsync(oneOfArrayRequest);
+        }
+
         /// <summary>
         /// Test RolesReportGet
         /// </summary>

samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/OneOfArrayRequestTests.cs

@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing OneOfArrayRequest
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class OneOfArrayRequestTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for OneOfArrayRequest
+        //private OneOfArrayRequest instance;
+
+        public OneOfArrayRequestTests()
+        {
+            // TODO uncomment below to create an instance of OneOfArrayRequest
+            //instance = new OneOfArrayRequest();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of OneOfArrayRequest
+        /// </summary>
+        [Fact]
+        public void OneOfArrayRequestInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" OneOfArrayRequest
+            //Assert.IsType<OneOfArrayRequest>(instance);
+        }
+    }
+}