[Rust] Use named lifetimes for UUID params in reqwest-trait (fix mockall build)

modules/openapi-generator/src/main/resources/rust/reqwest-trait/api.mustache

@@ -47,7 +47,7 @@ pub trait {{{classname}}}: Send + Sync {
     ### &str and Vec<&str>
     }}{{#isString}}{{#isArray}}Vec<{{/isArray}}{{^isUuid}}&'{{#lambda.lifetimeName}}{{{paramName}}}{{/lambda.lifetimeName}} str{{/isUuid}}{{#isArray}}>{{/isArray}}{{/isString}}{{!
     ### UUIDs
-    }}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isUuid}}{{!
+    }}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&'{{#lambda.lifetimeName}}{{{paramName}}}{{/lambda.lifetimeName}} str{{#isArray}}>{{/isArray}}{{/isUuid}}{{!
     ### Models and primative types
     }}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{!
     ### Option End
@@ -155,7 +155,7 @@ impl {{classname}} for {{classname}}Client {
     ### &str and Vec<&str>
     }}{{#isString}}{{#isArray}}Vec<{{/isArray}}{{^isUuid}}&'{{#lambda.lifetimeName}}{{{paramName}}}{{/lambda.lifetimeName}} str{{/isUuid}}{{#isArray}}>{{/isArray}}{{/isString}}{{!
     ### UUIDs
-    }}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isUuid}}{{!
+    }}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&'{{#lambda.lifetimeName}}{{{paramName}}}{{/lambda.lifetimeName}} str{{#isArray}}>{{/isArray}}{{/isUuid}}{{!
     ### Models and primative types
     }}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{!
     ### Option End

modules/openapi-generator/src/test/java/org/openapitools/codegen/rust/RustClientCodegenTest.java

@@ -311,4 +311,24 @@ public void testArrayWithObjectEnumValues() throws IOException {
         TestUtils.assertFileExists(outputPath);
         TestUtils.assertFileContains(outputPath, enumSpec);
     }
+
+    @Test
+    public void testReqwestTraitUuidParamsUseNamedLifetimes() throws IOException {
+        Path target = Files.createTempDirectory("test");
+        target.toFile().deleteOnExit();
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("rust")
+                .setLibrary("reqwest-trait")
+                .addAdditionalProperty("mockall", true)
+                .setInputSpec("src/test/resources/3_0/rust/reqwest-trait-uuid-params.yaml")
+                .setSkipOverwrite(false)
+                .setOutputDir(target.toAbsolutePath().toString().replace("\\", "/"));
+        new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
+        Path outputPath = Path.of(target.toString(), "/src/apis/widget_api.rs");
+        TestUtils.assertFileExists(outputPath);
+        // mockall's #[automock] cannot elide the lifetime of a reference nested in Option<..>
+        TestUtils.assertFileContains(outputPath,
+                "async fn list_widget_items<'id, 'run_id>(&self, id: &'id str, run_id: Option<&'run_id str>)");
+        TestUtils.assertFileNotContains(outputPath, "Option<&str>");
+    }
 }

modules/openapi-generator/src/test/resources/3_0/rust/reqwest-trait-uuid-params.yaml

@@ -0,0 +1,31 @@
+openapi: 3.0.3
+info:
+  title: UUID parameters with the reqwest-trait library
+  description: >-
+    Regression test for #24912. UUID parameters must use the named lifetime
+    declared on the trait method (e.g. Option<&'run_id str>), otherwise
+    mockall's #[automock] fails to compile.
+  version: 1.0.0
+paths:
+  /widgets/{id}/items:
+    parameters:
+      - name: id
+        in: path
+        required: true
+        schema:
+          type: string
+          format: uuid
+    get:
+      operationId: listWidgetItems
+      tags:
+        - widget
+      parameters:
+        - name: run_id
+          in: query
+          required: false
+          schema:
+            type: string
+            format: uuid
+      responses:
+        "204":
+          description: No content