Add model name mapping option to rust generators (OpenAPITools#21282)

* add model name mapping option to rust generators

* update package name

* update samples

Author: FilipBac

bin/configs/rust-hyper-test-duplicates.yaml

@@ -0,0 +1,10 @@
+generatorName: rust
+outputDir: samples/client/petstore/rust/hyper/test-duplicates
+library: hyper
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/test_duplicates.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: "false"
+  packageName: test-duplicates-hyper
+modelNameMappings:
+  Duplicatetest: another_test

bin/configs/rust-reqwest-test-duplicates.yaml

@@ -0,0 +1,12 @@
+generatorName: rust
+outputDir: samples/client/petstore/rust/reqwest/test-duplicates
+library: reqwest
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/test_duplicates.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: false
+  packageName: test-duplicates-reqwest
+enumNameMappings:
+  delivered: shipped
+modelNameMappings:
+  Duplicatetest: another_test

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

@@ -346,6 +346,10 @@ protected String addModelNamePrefixAndSuffix(String name) {
 
     @Override
     public String toModelName(String name) {
+        if (modelNameMapping.containsKey(name)) {
+            return modelNameMapping.get(name);
+        }
+
         return sanitizeIdentifier(addModelNamePrefixAndSuffix(name), CasingType.CAMEL_CASE, "model", "model", false);
     }
 

modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml

@@ -656,26 +656,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/TypeTesting'
-  '/tests/discriminatorDuplicateEnums':
-    get:
-      tags:
-        - testing
-      summary: 'Test for duplicate enums when using discriminator. (One of the issues in #20500)'
-      responses:
-        '200':
-          description: test
-          content:
-            application/json:
-              schema:
-                anyOf:
-                  - $ref: '#/components/schemas/Person'
-                  - $ref: '#/components/schemas/Vehicle'
-                discriminator:
-                  propertyName: objectType
-                  mapping:
-                    student: '#/components/schemas/Person'
-                    teacher: '#/components/schemas/Person'
-                    car: '#/components/schemas/Vehicle'
   '/tests/allOfWithOneModel':
     get:
       tags:
@@ -1078,16 +1058,6 @@ components:
       required:
        - type
        - speed
-    DuplicateTest:
-      type: object
-      properties:
-        name:
-          type: string
-    Duplicatetest: # explicitly testing the same name with different casing
-      type: object
-      properties:
-        name:
-          type: string
     existing_tags_array:
       type: array
       items:
@@ -1107,3 +1077,30 @@ components:
           allOf:
             - $ref: '#/components/schemas/existing_tags_array'
             - description: This is a test for allOf with metadata only fields
+    WithInnerOneOf:
+      type: object
+      properties:
+        foo:
+          type: object
+          oneOf:
+            - $ref: '#/components/schemas/Order'
+            - $ref: '#/components/schemas/Order'
+    Page:
+      type: object
+      properties:
+        page:
+          type: integer
+          format: int32
+        perPage:
+          type: integer
+          format: int32
+  parameters:
+    PageExplode:
+      name: pageExplode
+      in: query
+      description: Object containing page `size` and page `number`.
+      required: false
+      style: deepObject
+      explode: true
+      schema:
+        $ref: '#/components/schemas/Page'

modules/openapi-generator/src/test/resources/3_0/rust/test_duplicates.yaml

@@ -0,0 +1,78 @@
+openapi: 3.0.0
+servers:
+  - url: 'http://petstore.swagger.io/v2'
+info:
+  description: To test duplicates
+  version: 1.0.0
+  title: OpenAPI Petstore
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - name: pet
+    description: Everything about your Pets
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+paths:
+  '/tests/discriminatorDuplicateEnums':
+    get:
+      tags:
+        - testing
+      summary: 'Test for duplicate enums when using discriminator. (One of the issues in #20500)'
+      responses:
+        '200':
+          description: test
+          content:
+            application/json:
+              schema:
+                anyOf:
+                  - $ref: '#/components/schemas/Person'
+                  - $ref: '#/components/schemas/Vehicle'
+                discriminator:
+                  propertyName: objectType
+                  mapping:
+                    student: '#/components/schemas/Person'
+                    teacher: '#/components/schemas/Person'
+                    car: '#/components/schemas/Vehicle'
+externalDocs:
+  description: Find out more about Swagger
+  url: 'http://swagger.io'
+components:
+  schemas:
+    DuplicateTest:
+      type: object
+      properties:
+        name:
+          type: string
+    Duplicatetest: # explicitly testing the same name with different casing
+      type: object
+      properties:
+        name:
+          type: string
+    DuplicateOneOf:
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/Person'
+        - $ref: '#/components/schemas/Person'
+    Person:
+      type: object
+      properties:
+        type:
+          type: string
+        name:
+          type: string
+      required:
+       - type
+       - name
+    Vehicle:
+      type: object
+      properties:
+        type:
+          type: string
+        speed:
+          type: number
+      required:
+       - type
+       - speed

samples/client/petstore/rust/hyper/petstore/.openapi-generator/FILES

@@ -8,14 +8,13 @@ docs/ApiResponse.md
 docs/ArrayItemRefTest.md
 docs/Baz.md
 docs/Category.md
-docs/DuplicateTest.md
-docs/Duplicatetest.md
 docs/EnumArrayTesting.md
 docs/FakeApi.md
 docs/NullableArray.md
 docs/NumericEnumTesting.md
 docs/OptionalTesting.md
 docs/Order.md
+docs/Page.md
 docs/Person.md
 docs/Pet.md
 docs/PetApi.md
@@ -26,12 +25,12 @@ docs/StoreApi.md
 docs/Tag.md
 docs/TestAllOfWithMultiMetadataOnly.md
 docs/TestingApi.md
-docs/TestsDiscriminatorDuplicateEnumsGet200Response.md
 docs/TypeTesting.md
 docs/UniqueItemArrayTesting.md
 docs/User.md
 docs/UserApi.md
 docs/Vehicle.md
+docs/WithInnerOneOf.md
 git_push.sh
 src/apis/client.rs
 src/apis/configuration.rs
@@ -43,15 +42,12 @@ src/apis/store_api.rs
 src/apis/testing_api.rs
 src/apis/user_api.rs
 src/lib.rs
-src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
 src/models/action_container.rs
 src/models/any_type_test.rs
 src/models/api_response.rs
 src/models/array_item_ref_test.rs
 src/models/baz.rs
 src/models/category.rs
-src/models/duplicate_test.rs
-src/models/duplicatetest.rs
 src/models/enum_array_testing.rs
 src/models/mod.rs
 src/models/model_ref.rs
@@ -60,6 +56,7 @@ src/models/nullable_array.rs
 src/models/numeric_enum_testing.rs
 src/models/optional_testing.rs
 src/models/order.rs
+src/models/page.rs
 src/models/person.rs
 src/models/pet.rs
 src/models/property_test.rs
@@ -69,3 +66,4 @@ src/models/type_testing.rs
 src/models/unique_item_array_testing.rs
 src/models/user.rs
 src/models/vehicle.rs
+src/models/with_inner_one_of.rs

samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION

@@ -9,7 +9,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Generator version: 7.13.0-SNAPSHOT
+- Generator version: 7.14.0-SNAPSHOT
 - Build package: `org.openapitools.codegen.languages.RustClientCodegen`
 
 ## Installation
@@ -32,6 +32,8 @@ Class | Method | HTTP request | Description
 *PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **Get** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **Get** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **Get** /pet/{petId} | Find pet by ID
+*PetApi* | [**pets_explode_post**](docs/PetApi.md#pets_explode_post) | **Post** /pets/explode | List all pets
+*PetApi* | [**pets_post**](docs/PetApi.md#pets_post) | **Post** /pets | List all pets
 *PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **Put** /pet | Update an existing pet
 *PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **Post** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **Post** /pet/{petId}/uploadImage | uploads an image
@@ -40,7 +42,6 @@ Class | Method | HTTP request | Description
 *StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **Get** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **Post** /store/order | Place an order for a pet
 *TestingApi* | [**tests_all_of_with_one_model_get**](docs/TestingApi.md#tests_all_of_with_one_model_get) | **Get** /tests/allOfWithOneModel | Test for allOf with a single option. (One of the issues in #20500)
-*TestingApi* | [**tests_discriminator_duplicate_enums_get**](docs/TestingApi.md#tests_discriminator_duplicate_enums_get) | **Get** /tests/discriminatorDuplicateEnums | Test for duplicate enums when using discriminator. (One of the issues in #20500)
 *TestingApi* | [**tests_file_response_get**](docs/TestingApi.md#tests_file_response_get) | **Get** /tests/fileResponse | Returns an image file
 *TestingApi* | [**tests_type_testing_get**](docs/TestingApi.md#tests_type_testing_get) | **Get** /tests/typeTesting | Route to test the TypeTesting schema
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **Post** /user | Create user
@@ -61,25 +62,24 @@ Class | Method | HTTP request | Description
  - [ArrayItemRefTest](docs/ArrayItemRefTest.md)
  - [Baz](docs/Baz.md)
  - [Category](docs/Category.md)
- - [DuplicateTest](docs/DuplicateTest.md)
- - [Duplicatetest](docs/Duplicatetest.md)
  - [EnumArrayTesting](docs/EnumArrayTesting.md)
  - [NullableArray](docs/NullableArray.md)
  - [NumericEnumTesting](docs/NumericEnumTesting.md)
  - [OptionalTesting](docs/OptionalTesting.md)
  - [Order](docs/Order.md)
+ - [Page](docs/Page.md)
  - [Person](docs/Person.md)
  - [Pet](docs/Pet.md)
  - [PropertyTest](docs/PropertyTest.md)
  - [Ref](docs/Ref.md)
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [TestAllOfWithMultiMetadataOnly](docs/TestAllOfWithMultiMetadataOnly.md)
- - [TestsDiscriminatorDuplicateEnumsGet200Response](docs/TestsDiscriminatorDuplicateEnumsGet200Response.md)
  - [TypeTesting](docs/TypeTesting.md)
  - [UniqueItemArrayTesting](docs/UniqueItemArrayTesting.md)
  - [User](docs/User.md)
  - [Vehicle](docs/Vehicle.md)
+ - [WithInnerOneOf](docs/WithInnerOneOf.md)
 
 
 To get access to the crate's generated documentation, use: