Jersey2/3: Allow multiple Accept-Header entries

Author: jheyens

bin/configs/java-jersey2-8.yaml

@@ -4,6 +4,7 @@ library: jersey2
 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
+  withXml: true
   artifactId: petstore-openapi3-jersey2-java8
   hideGenerationTimestamp: true
   serverPort: "8082"

bin/configs/java-jersey3.yaml

@@ -4,6 +4,7 @@ library: jersey3
 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
+  withXml: true
   useBeanValidation: true
   artifactId: petstore-jersey3
   hideGenerationTimestamp: true

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/jersey2/pom.mustache

@@ -332,6 +332,13 @@
             <artifactId>jersey-media-jaxb</artifactId>
             <version>${jersey-version}</version>
         </dependency>
+        <!-- Also requires Jackson XML dataformat due to @JacksonXml*-annotations -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <!-- Jackson's databind and dataformat libraries seem to be released synchronously -->
+            <version>${jackson-databind-version}</version>
+        </dependency>
         {{/withXml}}
         {{#joda}}
         <dependency>

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, ",");
   }
 
   /**

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

@@ -332,6 +332,13 @@
             <artifactId>jersey-media-jaxb</artifactId>
             <version>${jersey-version}</version>
         </dependency>
+        <!-- Also requires Jackson XML dataformat due to @JacksonXml*-annotations -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <!-- Jackson's databind and dataformat libraries seem to be released synchronously -->
+            <version>${jackson-databind-version}</version>
+        </dependency>
         {{/withXml}}
         {{#joda}}
         <dependency>