Update paramName template usage to ensure reserved keywords in parame…

…ters name are properly escaped

This commit addresses Yelp#147

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/api.mustache

@@ -11,7 +11,7 @@ interface {{classname}} {
     /**{{#summary}}{{{newline}}}     * {{{summary}}}{{/summary}}{{#notes}}{{{newline}}}     * {{{<br/>}}}{{{notes}}}{{/notes}}
      * The endpoint is owned by {{{vendorExtensions.x-team-owners}}}{{^vendorExtensions.x-team-owners}}{{service_name}} service owner{{/vendorExtensions.x-team-owners}}
 {{#allParams}}
-     * @param {{paramName}}{{#description}} {{description}}{{/description}} ({{#required}}required{{/required}}{{^required}}optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}{{/required}})
+     * @param {{{paramName}}}{{#description}} {{description}}{{/description}} ({{#required}}required{{/required}}{{^required}}optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}{{/required}})
 {{/allParams}}
 {{#externalDocs}}
      * {{description}}

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/bodyParams.mustache

@@ -1 +1 @@
-{{#isBodyParam}}@retrofit2.http.Body {{paramName}}: {{{dataType}}}{{/isBodyParam}}
+{{#isBodyParam}}@retrofit2.http.Body {{{paramName}}}: {{{dataType}}}{{/isBodyParam}}

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/formParams.mustache

@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{paramName}}: {{{dataType}}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") {{paramName}}: RequestBody{{^required}}?{{/required}}{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{paramName}}}: {{{dataType}}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") {{paramName}}: RequestBody{{^required}}?{{/required}}{{/isFile}}{{/isFormParam}}

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/headerParams.mustache

@@ -1 +1 @@
-{{#isHeaderParam}}@retrofit2.http.Header("{{baseName}}") {{paramName}}: {{{dataType}}}{{/isHeaderParam}}
+{{#isHeaderParam}}@retrofit2.http.Header("{{baseName}}") {{{paramName}}}: {{{dataType}}}{{/isHeaderParam}}

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/pathParams.mustache

@@ -1 +1 @@
-{{#isPathParam}}@retrofit2.http.Path("{{baseName}}") {{paramName}}: {{{dataType}}}{{/isPathParam}}
+{{#isPathParam}}@retrofit2.http.Path("{{baseName}}") {{{paramName}}}: {{{dataType}}}{{/isPathParam}}

gradle-plugin/plugin/src/main/resources/kotlin/retrofit2/queryParams.mustache

@@ -1 +1 @@
-{{#isQueryParam}}@retrofit2.http.Query("{{baseName}}") {{#collectionFormat}}{{^isCollectionFormatMulti}}@{{{collectionFormat.toUpperCase}}} {{/isCollectionFormatMulti}}{{/collectionFormat}}{{paramName}}: {{{dataType}}}{{^required}} = null{{/required}}{{/isQueryParam}}
+{{#isQueryParam}}@retrofit2.http.Query("{{baseName}}") {{#collectionFormat}}{{^isCollectionFormatMulti}}@{{{collectionFormat.toUpperCase}}} {{/isCollectionFormatMulti}}{{/collectionFormat}}{{{paramName}}}: {{{dataType}}}{{^required}} = null{{/required}}{{/isQueryParam}}