Jersey2/3: Allow multiple Accept-Header entries

Author: jheyens

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache

@@ -51,6 +51,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Date;
@@ -922,8 +923,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   /**
    * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
+   *   if JSON exists in the given array, makes sure there is only one entry of it.
    *
    * @param accepts The accepts array to select from
    * @return The Accept header to use. If the given array is empty,
@@ -933,12 +933,19 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     if (accepts == null || accepts.length == 0) {
       return null;
     }
+    Set<String> acceptHeaders = new LinkedHashSet<>();
+    boolean foundJsonMime = false;
     for (String accept : accepts) {
       if (isJsonMime(accept)) {
-        return accept;
+        if (foundJsonMime) { 
+          continue;
+        } else {
+          foundJsonMime = true; 
+        }
       }
+      acceptHeaders.add(accept);
     }
-    return StringUtil.join(accepts, ",");
+    return StringUtil.join(acceptHeaders, ",");
   }
 
   /**

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache

@@ -51,6 +51,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Date;
@@ -922,8 +923,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   /**
    * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
+   *   if JSON exists in the given array, makes sure there is only one entry of it.
    *
    * @param accepts The accepts array to select from
    * @return The Accept header to use. If the given array is empty,
@@ -933,12 +933,19 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     if (accepts == null || accepts.length == 0) {
       return null;
     }
+    Set<String> acceptHeaders = new LinkedHashSet<>();
+    boolean foundJsonMime = false;
     for (String accept : accepts) {
       if (isJsonMime(accept)) {
-        return accept;
+        if (foundJsonMime) { 
+          continue;
+        } else {
+          foundJsonMime = true; 
+        }
       }
+      acceptHeaders.add(accept);
     }
-    return StringUtil.join(accepts, ",");
+    return StringUtil.join(acceptHeaders, ",");
   }
 
   /**