diff --git a/src/main/resources/JavaJaxRS/api.mustache b/src/main/resources/JavaJaxRS/api.mustache
index 766af3a8a4f..c5186394c40 100644
--- a/src/main/resources/JavaJaxRS/api.mustache
+++ b/src/main/resources/JavaJaxRS/api.mustache
@@ -19,13 +19,12 @@ public class {{classname}} {
   {{#operation}}
   @{{httpMethod}}
   @Path("{{path}}")
-  @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class {{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}})
+  @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}})
   @ApiResponses(value = { {{#responses}}
     @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},
     {{/hasMore}}{{/responses}} })
      
-  public Response {{nickname}}(
-    {{#allParams}}{{>queryParams}}{{>pathParams}} {{>headerParams}} {{>bodyParams}} {{#hasMore}},{{/hasMore}}{{/allParams}})
+  public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{#hasMore}},{{/hasMore}}{{/allParams}})
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/src/main/resources/JavaJaxRS/bodyParams.mustache b/src/main/resources/JavaJaxRS/bodyParams.mustache
index 109e3bf26fc..a959ec2c8d5 100644
--- a/src/main/resources/JavaJaxRS/bodyParams.mustache
+++ b/src/main/resources/JavaJaxRS/bodyParams.mustache
@@ -1 +1 @@
-{{#bodyParams}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{newline}}{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{newline}}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{newline}}{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/bodyParams}}
\ No newline at end of file
+{{#bodyParams}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/bodyParams}}
\ No newline at end of file
diff --git a/src/main/resources/JavaJaxRS/headerParams.mustache b/src/main/resources/JavaJaxRS/headerParams.mustache
index 0054c4c6dee..f9f5e1326fc 100644
--- a/src/main/resources/JavaJaxRS/headerParams.mustache
+++ b/src/main/resources/JavaJaxRS/headerParams.mustache
@@ -1 +1 @@
-{{#headerParams}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{newline}}{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{newline}}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{newline}}{{/defaultValue}})@HeaderParam("{{paramName}}"){{newline}} {{{dataType}}} {{paramName}}{{/headerParams}}
\ No newline at end of file
+{{#headerParams}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/headerParams}}
\ No newline at end of file
diff --git a/src/main/resources/JavaJaxRS/pathParams.mustache b/src/main/resources/JavaJaxRS/pathParams.mustache
index 7d3fcce56ad..05923c12435 100644
--- a/src/main/resources/JavaJaxRS/pathParams.mustache
+++ b/src/main/resources/JavaJaxRS/pathParams.mustache
@@ -1 +1 @@
-{{#pathParams}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{newline}}{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{newline}}{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{newline}}{{/defaultValue}})@PathParam("{{paramName}}"){{newline}} {{{dataType}}} {{paramName}}{{/pathParams}}
\ No newline at end of file
+{{#pathParams}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/pathParams}}
\ No newline at end of file
diff --git a/src/main/resources/JavaJaxRS/queryParams.mustache b/src/main/resources/JavaJaxRS/queryParams.mustache
index 7724ba420a8..dbe3ed1c377 100644
--- a/src/main/resources/JavaJaxRS/queryParams.mustache
+++ b/src/main/resources/JavaJaxRS/queryParams.mustache
@@ -1 +1 @@
-{{#queryParams}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{newline}}{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{newline}}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{newline}}{{/defaultValue}})@QueryParam("{{paramName}}"){{newline}} {{{dataType}}} {{paramName}}{{/queryParams}} 
\ No newline at end of file
+{{#queryParams}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{newline}}{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{newline}}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{newline}}{{/defaultValue}}) @QueryParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/queryParams}} 
\ No newline at end of file