Custom Content type: better message and added tests (#12841)

* add tests for custom mime types * better message for custom mime type example handling * minor code format change
2022-07-12 18:32:15 +08:00 · 2022-07-12 18:32:15 +08:00 · 60c5875091
commit 60c5875091
parent 6dfbc58bb8
20 changed files with 44 additions and 25 deletions
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
@ -171,7 +171,7 @@ public class ExampleGenerator {
                        output.add(kv);
                    }
                } else {
-                    kv.put(EXAMPLE, "null");
+                    kv.put(EXAMPLE, "Custom MIME type example not yet supported: " + mediaType);
                    output.add(kv);
                }
            }
--- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@ -1069,6 +1069,10 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/ApiResponse'
+            application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:
+              # Export data as Excel spreadsheet.
+              schema:
+                $ref: '#/components/schemas/ApiResponse'
      security:
        - petstore_auth:
            - 'write:pets'
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs
@ -2033,7 +2033,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -2122,7 +2123,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
@ -1654,7 +1654,8 @@ namespace Org.OpenAPITools.Api
                        request.Content.Headers.Add("ContentType", contentType);

                    string[] accepts = new string[] { 
-                        "application/json" 
+                        "application/json", 
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" 
                    };

                    string? accept = ClientUtils.SelectHeaderAccept(accepts);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
@ -1513,7 +1513,8 @@ namespace Org.OpenAPITools.Api
                        request.Content.Headers.Add("ContentType", contentType);

                    string[] accepts = new string[] { 
-                        "application/json" 
+                        "application/json", 
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" 
                    };

                    string accept = ClientUtils.SelectHeaderAccept(accepts);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
@ -1513,7 +1513,8 @@ namespace Org.OpenAPITools.Api
                        request.Content.Headers.Add("ContentType", contentType);

                    string[] accepts = new string[] { 
-                        "application/json" 
+                        "application/json", 
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" 
                    };

                    string accept = ClientUtils.SelectHeaderAccept(accepts);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md
@ -880,7 +880,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs
@ -1871,7 +1871,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -1945,7 +1946,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };


--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs
@ -2033,7 +2033,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -2122,7 +2123,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs
@ -2033,7 +2033,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -2122,7 +2123,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
@ -2033,7 +2033,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -2122,7 +2123,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
@ -844,7 +844,7 @@ catch (ApiException e)
 ### HTTP request headers

 - **Content-Type**: multipart/form-data
- - **Accept**: application/json
+ - **Accept**: application/json, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet


 ### HTTP response details
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs
@ -2033,7 +2033,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
@ -2122,7 +2123,8 @@ namespace Org.OpenAPITools.Api

            // to determine the Accept header
            string[] _accepts = new string[] {
-                "application/json"
+                "application/json",
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
            };

            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);