Fixups for rust-server hyper1 support (#22321)

Author: dsteeley

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

@@ -370,6 +370,16 @@ public String toOperationId(String operationId) {
         return sanitizeIdentifier(operationId, CasingType.CAMEL_CASE, "call", "method", true);
     }
 
+    @Override
+    public String toParamName(String name) {
+        // rust-server doesn't support r# in param name.
+        if (parameterNameMapping.containsKey(name)) {
+            return parameterNameMapping.get(name);
+        }
+
+        return sanitizeIdentifier(name, CasingType.SNAKE_CASE, "param", "parameter", false);
+    }
+
     @Override
     public String toEnumValue(String value, String datatype) {
         // rust-server templates expect value to be in quotes
@@ -1229,6 +1239,9 @@ public CodegenModel fromModel(String name, Schema model) {
                 && (mdl.dataType.startsWith("swagger::OneOf") || mdl.dataType.startsWith("swagger::AnyOf"))) {
             toStringSupport = false;
             partialOrdSupport = false;
+        } else if (mdl.dataType != null && mdl.dataType.equals("serde_json::Value")) {
+            // Value doesn't implement PartialOrd
+            partialOrdSupport = false;
         } else if (mdl.getAdditionalPropertiesType() != null) {
             toStringSupport = false;
         } else if (model instanceof ComposedSchema) {
@@ -1545,7 +1558,18 @@ private void processParam(CodegenParameter param, CodegenOperation op) {
             }
         } else {
             param.vendorExtensions.put("x-format-string", "{:?}");
-            if (param.example != null) {
+            // Check if this is a model-type enum (allowableValues with values list)
+            if (param.allowableValues != null && param.allowableValues.containsKey("values")) {
+                List<?> values = (List<?>) param.allowableValues.get("values");
+                if (!values.isEmpty()) {
+                    // Use the first enum value as the example.
+                    String firstEnumValue = values.get(0).toString();
+                    String enumVariant = toEnumVarName(firstEnumValue, param.dataType);
+                    example = param.dataType + "::" + enumVariant;
+                } else if (param.example != null) {
+                    example = "serde_json::from_str::<" + param.dataType + ">(r#\"" + param.example + "\"#).expect(\"Failed to parse JSON example\")";
+                }
+            } else if (param.example != null) {
                 example = "serde_json::from_str::<" + param.dataType + ">(r#\"" + param.example + "\"#).expect(\"Failed to parse JSON example\")";
             }
         }

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

@@ -1229,6 +1229,9 @@ public CodegenModel fromModel(String name, Schema model) {
                 && (mdl.dataType.startsWith("swagger::OneOf") || mdl.dataType.startsWith("swagger::AnyOf"))) {
             toStringSupport = false;
             partialOrdSupport = false;
+        } else if (mdl.dataType != null && mdl.dataType.equals("serde_json::Value")) {
+            // Value doesn't implement PartialOrd
+            partialOrdSupport = false;
         } else if (mdl.getAdditionalPropertiesType() != null) {
             toStringSupport = false;
         } else if (model instanceof ComposedSchema) {
@@ -1546,7 +1549,18 @@ private void processParam(CodegenParameter param, CodegenOperation op) {
         }
             else {
             param.vendorExtensions.put("x-format-string", "{:?}");
-            if (param.example != null) {
+            // Check if this is a model-type enum (allowableValues with values list)
+            if (param.allowableValues != null && param.allowableValues.containsKey("values")) {
+                List<?> values = (List<?>) param.allowableValues.get("values");
+                if (!values.isEmpty()) {
+                    // Use the first enum value as the example.
+                    String firstEnumValue = values.get(0).toString();
+                    String enumVariant = toEnumVarName(firstEnumValue, param.dataType);
+                    example = param.dataType + "::" + enumVariant;
+                } else if (param.example != null) {
+                    example = "serde_json::from_str::<" + param.dataType + ">(r#\"" + param.example + "\"#).expect(\"Failed to parse JSON example\")";
+                }
+            } else if (param.example != null) {
                 example = "serde_json::from_str::<" + param.dataType + ">(r#\"" + param.example + "\"#).expect(\"Failed to parse JSON example\")";
             }
         }

modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache

@@ -80,12 +80,17 @@
       {{/required}}
       {{#exts}}
         {{#x-consumes-plain-text}}
-          {{#isByteArray}}
-        let body = String::from_utf8(param_body.0).expect("Body was not valid UTF8");
-          {{/isByteArray}}
-          {{^isByteArray}}
+        {{^isByteArray}}
+        {{^isBinary}}
         let body = param_{{{paramName}}};
-          {{/isByteArray}}
+        {{/isBinary}}
+        {{/isByteArray}}
+        {{#isByteArray}}
+        let body = String::from_utf8(param_{{{paramName}}}.0).expect("Body was not valid UTF8");
+        {{/isByteArray}}
+        {{#isBinary}}
+        let body = String::from_utf8(param_{{{paramName}}}.0).expect("Body was not valid UTF8");
+        {{/isBinary}}
         {{/x-consumes-plain-text}}
         {{#x-consumes-xml}}
         let body = param_{{{paramName}}}.as_xml();

modules/openapi-generator/src/main/resources/rust-server/server-request-body-basic.mustache

@@ -28,6 +28,9 @@
 
           {{/x-consumes-plain-text}}
           {{#x-consumes-plain-text}}
+            {{#isBinary}}
+                                    Some(swagger::ByteArray(body.to_vec()))
+            {{/isBinary}}
             {{#isByteArray}}
                                     Some(swagger::ByteArray(body.to_vec()))
             {{/isByteArray}}

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

@@ -500,6 +500,7 @@ paths:
       summary: Test a Form Post
       operationId: FormTest
       requestBody:
+        required: true
         content:
           application/x-www-form-urlencoded:
             schema:
@@ -509,7 +510,13 @@ paths:
                   type: array
                   items:
                     type: string
-        required: true
+                enum_field:
+                  type: string
+                  enum:
+                    - one_enum
+              required:
+                - requiredArray
+                - enum_field
       responses:
         '200':
           description: OK
@@ -728,6 +735,9 @@ components:
     NullableObject:
       type: string
       nullable: true
+    NoTypeObject:
+      title: an object with no type
+      description: An object with no type
     NullableTest:
       type: object
       required:

samples/server/petstore/rust-server-deprecated/output/openapi-v3/.openapi-generator/FILES

@@ -19,11 +19,13 @@ docs/DuplicateXmlObject.md
 docs/EnumWithStarObject.md
 docs/Err.md
 docs/Error.md
+docs/FormTestRequestEnumField.md
 docs/Model12345AnyOfObject.md
 docs/Model12345AnyOfObjectAnyOf.md
 docs/MultigetGet201Response.md
 docs/MyId.md
 docs/MyIdList.md
+docs/NoTypeObject.md
 docs/NullableObject.md
 docs/NullableTest.md
 docs/ObjectHeader.md

samples/server/petstore/rust-server-deprecated/output/openapi-v3/README.md

@@ -113,6 +113,7 @@ cargo run --example client XmlOtherPost
 cargo run --example client XmlOtherPut
 cargo run --example client XmlPost
 cargo run --example client XmlPut
+cargo run --example client EnumInPathPathParamGet
 cargo run --example client MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGet
 cargo run --example client CreateRepo
 cargo run --example client GetRepoInfo
@@ -201,11 +202,13 @@ Method | HTTP request | Description
  - [EnumWithStarObject](docs/EnumWithStarObject.md)
  - [Err](docs/Err.md)
  - [Error](docs/Error.md)
+ - [FormTestRequestEnumField](docs/FormTestRequestEnumField.md)
  - [Model12345AnyOfObject](docs/Model12345AnyOfObject.md)
  - [Model12345AnyOfObjectAnyOf](docs/Model12345AnyOfObjectAnyOf.md)
  - [MultigetGet201Response](docs/MultigetGet201Response.md)
  - [MyId](docs/MyId.md)
  - [MyIdList](docs/MyIdList.md)
+ - [NoTypeObject](docs/NoTypeObject.md)
  - [NullableObject](docs/NullableObject.md)
  - [NullableTest](docs/NullableTest.md)
  - [ObjectHeader](docs/ObjectHeader.md)

samples/server/petstore/rust-server-deprecated/output/openapi-v3/api/openapi.yaml

@@ -780,6 +780,9 @@ components:
     NullableObject:
       nullable: true
       type: string
+    NoTypeObject:
+      description: An object with no type
+      title: an object with no type
     NullableTest:
       properties:
         nullable:
@@ -847,12 +850,21 @@ components:
       anyOf:
       - $ref: "#/components/schemas/StringObject"
       - $ref: "#/components/schemas/UuidObject"
+    FormTest_request_enum_field:
+      enum:
+      - one_enum
+      type: string
     FormTest_request:
       properties:
         requiredArray:
           items:
             type: string
           type: array
+        enum_field:
+          $ref: "#/components/schemas/FormTest_request_enum_field"
+      required:
+      - enum_field
+      - requiredArray
       type: object
     AnyOfObject_anyOf:
       enum:

samples/server/petstore/rust-server-deprecated/output/openapi-v3/bin/cli.rs

@@ -112,7 +112,9 @@ enum Operation {
     /// Test a Form Post
     FormTest {
         #[structopt(parse(try_from_str = parse_json), long)]
-        required_array: Option<Vec<String>>,
+        required_array: Vec<String>,
+        #[structopt(parse(try_from_str = parse_json))]
+        enum_field: models::FormTestRequestEnumField,
     },
     GetWithBooleanParameter {
         /// Let's check apostrophes get encoded properly!
@@ -352,11 +354,13 @@ async fn main() -> Result<()> {
         }
         Operation::FormTest {
             required_array,
+            enum_field,
         } => {
             info!("Performing a FormTest request");
 
             let result = client.form_test(
                 required_array.as_ref(),
+                enum_field,
             ).await?;
             debug!("Result: {:?}", result);
 

samples/server/petstore/rust-server-deprecated/output/openapi-v3/docs/FormTestRequestEnumField.md

@@ -0,0 +1,9 @@
+# FormTestRequestEnumField
+
+## 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)
+
+