Review markups

Author: dsteeley

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

@@ -643,6 +643,19 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         // Set for deduplication of response IDs
         Set<String> responseIds = new HashSet();
 
+        // Determine the types that this operation produces overall, so that responses with no
+        // explicit `content` map (e.g. referencing a schema outside of a media type entry) still
+        // get a sensible default MIME type rather than none at all.
+        boolean producesXml = false;
+        boolean producesPlainText = false;
+        for (String mimeType : getProducesInfo(openAPI, operation)) {
+            if (isMimetypeXml(mimeType)) {
+                producesXml = true;
+            } else if (isMimetypePlain(mimeType)) {
+                producesPlainText = true;
+            }
+        }
+
         for (CodegenResponse rsp : op.responses) {
 
             // Get the original API response so we get process the schema
@@ -709,9 +722,14 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
 
             if (content.size() > 1) {
                 buildMultiContentTypeResponse(rsp, content);
-            } else {
-                String mimeType = content.isEmpty() ? null : content.keySet().iterator().next();
+            } else if (content.isEmpty()) {
+                // No explicit content entry for this response: fall back to the operation's
+                // overall produces info (XML/plain-text) or default to JSON, rather than leaving
+                // the response without any MIME type extension.
+                String mimeType = producesXml ? xmlMimeType : producesPlainText ? plainTextMimeType : jsonMimeType;
                 processInnerResponse(rsp, mimeType);
+            } else {
+                processInnerResponse(rsp, content.keySet().iterator().next());
             }
 
             for (CodegenProperty header : rsp.headers) {
@@ -794,16 +812,16 @@ private void buildMultiContentTypeResponse(CodegenResponse rsp, Map<String, Medi
         List<Map<String, Object>> variants = new ArrayList<>();
         List<String> typeArgs = new ArrayList<>();
 
+        // Every content type gets its own OneOf variant slot, even when two content types
+        // resolve to the same Rust type (e.g. an XML and a JSON variant of the same array/object
+        // schema): the server's outgoing match needs a distinct variant per content type to know
+        // which serialization to apply, so merging them into one slot would either drop a
+        // content type or produce an unreachable/duplicate match arm on the server side.
         for (Map.Entry<String, MediaType> entry : content.entrySet()) {
             String ct = entry.getKey();
             Schema schema = entry.getValue() != null ? entry.getValue().getSchema() : null;
             String dataType = computeVariantDataType(schema);
             String typeArg = dataType != null ? dataType : "()";
-
-            if (typeArgs.contains(typeArg)) {
-                LOGGER.warn("Response has multiple content types resolving to the same type '{}'; skipping duplicate variant for '{}'.", typeArg, ct);
-                continue;
-            }
             typeArgs.add(typeArg);
 
             Map<String, Object> exts = new LinkedHashMap<>();

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

@@ -12,7 +12,7 @@
 
                 let body = match content_type {
   {{/-first}}
-                    Ok("{{{contentType}}}") => {
+                    Ok(ct) if ct.eq_ignore_ascii_case("{{{contentType}}}") => {
 {{>client-response-body-variant-instance}}
                         {{{variantName}}}(body)
                     },

modules/openapi-generator/src/main/resources/rust-server/model_doc.mustache

@@ -1,9 +1,16 @@
 {{#models}}{{#model}}# {{{classname}}}
 
+{{#vars}}
+{{#-first}}
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{{name}}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{dataType}}}**]({{{complexType}}}.md){{/isPrimitiveType}} | {{{description}}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/-first}}
+**{{{name}}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{dataType}}}**]({{{complexType}}}.md){{/isPrimitiveType}} | {{{description}}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/vars}}
+{{^vars}}
+## Type
+{{#arrayModelType}}**Vec<{{{arrayModelType}}}>**{{/arrayModelType}}{{^arrayModelType}}**{{{dataType}}}**{{/arrayModelType}}
 {{/vars}}
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

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

@@ -145,9 +145,10 @@ public void testMultipleResponseContentTypes() throws IOException {
 
         // Two-content-type 403 response must use a OneOf2 return type.
         TestUtils.assertFileContains(clientModPath, "swagger::OneOf2::<");
-        // Both variant content types must appear as match arms in the dispatch code.
-        TestUtils.assertFileContains(clientModPath, "Ok(\"text/plain\")");
-        TestUtils.assertFileContains(clientModPath, "Ok(\"application/json\")");
+        // Both variant content types must appear as case-insensitive match arms in the dispatch
+        // code (HTTP media types are case-insensitive per RFC 7231).
+        TestUtils.assertFileContains(clientModPath, "ct.eq_ignore_ascii_case(\"text/plain\")");
+        TestUtils.assertFileContains(clientModPath, "ct.eq_ignore_ascii_case(\"application/json\")");
         // Content-Type header must be read for dispatch.
         TestUtils.assertFileContains(clientModPath, "CONTENT_TYPE");
 

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

@@ -1,8 +1,7 @@
 # AdditionalPropertiesReferencedAnyOfObject
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**std::collections::HashMap<String, models::AnyOfProperty>**
 
 [[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/server/petstore/rust-server/output/openapi-v3/docs/AdditionalPropertiesWithList.md

@@ -1,8 +1,7 @@
 # AdditionalPropertiesWithList
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**std::collections::HashMap<String, Vec<String>>**
 
 [[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/server/petstore/rust-server/output/openapi-v3/docs/AnotherXmlArray.md

@@ -1,8 +1,7 @@
 # AnotherXmlArray
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**Vec<String>**
 
 [[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/server/petstore/rust-server/output/openapi-v3/docs/AnotherXmlInner.md

@@ -1,8 +1,7 @@
 # AnotherXmlInner
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**String**
 
 [[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/server/petstore/rust-server/output/openapi-v3/docs/AnyOfGet202Response.md

@@ -1,8 +1,7 @@
 # AnyOfGet202Response
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**swagger::AnyOf2<models::StringObject,models::UuidObject>**
 
 [[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/server/petstore/rust-server/output/openapi-v3/docs/AnyOfHashMapObject.md

@@ -1,8 +1,7 @@
 # AnyOfHashMapObject
 
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
+## Type
+**swagger::AnyOf2<String,std::collections::HashMap<String, String>>**
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)