Fixed Rust model files not matching module imports causing compiler errors (#21134)

* fix(rust): Fixed Rust model files not matching module imports causing compiler errors

* chore(rust): Update samples with a duplicate model test

* update samples

---------

Co-authored-by: Ross Sullivan <rosssullivan101@gmail.com>

Author: ross-paypay

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

@@ -538,6 +538,12 @@ public String modelFileFolder() {
         return (outputFolder + File.separator + modelFolder).replace("/", File.separator);
     }
 
+    @Override
+    public String modelFilename(String templateName, String modelName) {
+        String suffix = modelTemplateFiles().get(templateName);
+        return modelFileFolder() + File.separator + toModelFilename(modelName) + suffix;
+    }
+
     @Override
     public String apiDocFileFolder() {
         return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);

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

@@ -1078,4 +1078,13 @@ 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

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

@@ -8,6 +8,8 @@ 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
@@ -47,6 +49,8 @@ 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

samples/client/petstore/rust/hyper/petstore/README.md

@@ -61,6 +61,8 @@ 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)

samples/client/petstore/rust/hyper/petstore/docs/DuplicateTest.md

@@ -0,0 +1,11 @@
+# DuplicateTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | Option<**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/rust/hyper/petstore/docs/Duplicatetest.md

@@ -0,0 +1,11 @@
+# Duplicatetest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | Option<**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/rust/hyper/petstore/src/models/duplicate_test.rs

@@ -0,0 +1,27 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ */
+
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct DuplicateTest {
+    #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+}
+
+impl DuplicateTest {
+    pub fn new() -> DuplicateTest {
+        DuplicateTest {
+            name: None,
+        }
+    }
+}
+

samples/client/petstore/rust/hyper/petstore/src/models/duplicatetest.rs

@@ -0,0 +1,27 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ */
+
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Duplicatetest {
+    #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+}
+
+impl Duplicatetest {
+    pub fn new() -> Duplicatetest {
+        Duplicatetest {
+            name: None,
+        }
+    }
+}
+

samples/client/petstore/rust/hyper/petstore/src/models/mod.rs

@@ -10,6 +10,10 @@ pub mod baz;
 pub use self::baz::Baz;
 pub mod category;
 pub use self::category::Category;
+pub mod duplicate_test;
+pub use self::duplicate_test::DuplicateTest;
+pub mod duplicatetest;
+pub use self::duplicatetest::Duplicatetest;
 pub mod enum_array_testing;
 pub use self::enum_array_testing::EnumArrayTesting;
 pub mod nullable_array;

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

@@ -8,6 +8,8 @@ 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
@@ -45,6 +47,8 @@ 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