modify getContentType method

OpenAPITools · Aug 3, 2022 · a2aa627 · a2aa627
1 parent 56ccfff
commit a2aa627
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -708,14 +708,18 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Parse content type object from header value
    */
-  private ContentType getContentType(String headerValue) {
-    return ContentType.getByMimeType(headerValue);
+  private ContentType getContentType(String headerValue) throws ApiException {
+    try {
+      return ContentType.parse(headerValue);
+    } catch (ParseException e) {
+      throw new ApiException("Could not parse content type " + headerValue);
+    }
   }
 
   /**
    * Get content type of a response or null if one was not provided
    */
-  private String getResponseMimeType(HttpResponse response) {
+  private String getResponseMimeType(HttpResponse response) throws ApiException {
     Header contentTypeHeader = response.getFirstHeader("Content-Type");
     if (contentTypeHeader != null) {
       return getContentType(contentTypeHeader.getValue()).getMimeType();

diff --git a/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -663,14 +663,18 @@ protected Map<String, List<String>> transformResponseHeaders(Header[] headers) {
   /**
    * Parse content type object from header value
    */
-  private ContentType getContentType(String headerValue) {
-    return ContentType.getByMimeType(headerValue);
+  private ContentType getContentType(String headerValue) throws ApiException {
+    try {
+      return ContentType.parse(headerValue);
+    } catch (ParseException e) {
+      throw new ApiException("Could not parse content type " + headerValue);
+    }
   }
 
   /**
    * Get content type of a response or null if one was not provided
    */
-  private String getResponseMimeType(HttpResponse response) {
+  private String getResponseMimeType(HttpResponse response) throws ApiException {
     Header contentTypeHeader = response.getFirstHeader("Content-Type");
     if (contentTypeHeader != null) {
       return getContentType(contentTypeHeader.getValue()).getMimeType();