Refactor templates

Author: gcatanese

templates-v7/libraries/jersey3/api_overload.mustache

@@ -1,2 +1,3 @@
 {{! Overload contains just required and body params }}
-{{#requiredParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#bodyParams}}{{^required}}{{#hasRequiredParams}}, {{/hasRequiredParams}}{{{dataType}}} {{paramName}}{{/required}}{{/bodyParams}}
+{{#requiredParams}}{{^isHeaderParam}}{{^isBodyParam}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{#-last}}{{#hasBodyParam}}, {{/hasBodyParam}}{{/-last}}{{/isBodyParam}}{{/isHeaderParam}}
+{{/requiredParams}}{{#bodyParams}}{{{dataType}}} {{paramName}}{{/bodyParams}}

templates-v7/libraries/jersey3/api_summary_overload.mustache

@@ -1,12 +1,15 @@
     /**
     * {{summary}}
     *
-{{#requiredParams}}
+    {{#pathParams}}
+    * @param {{paramName}} {@link {{dataType}} } {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}}
+    {{/pathParams}}
+    {{#bodyParams}}
     * @param {{paramName}} {@link {{dataType}} } {{description}} (required)
-{{/requiredParams}}
-{{#bodyParams}}
-    * @param {{paramName}} {@link {{dataType}} } {{description}} (required)
-{{/bodyParams}}
+    {{/bodyParams}}
+    {{#queryParams}}{{#required}}
+    * @param {{paramName}} {@link {{dataType}} } Query: {{description}} (required)
+    {{/required}}{{/queryParams}}
 {{#returnType}}
     * @return {@link {{.}} }
 {{/returnType}}