[scala][http4s] fix codegen for using reserved words in openapi (#21490)

Author: donilg

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java

@@ -807,12 +807,12 @@ private String cpToPathParameter(CodegenParameter cp, Set<String> imports, Map<S
 
         if (_vendorExtensions.size() == 1) { // only `x-type`
             if ("String".equals(cp.getDataType())) {
-                return cp.baseName;
+                return cp.paramName;
             } else {
-                return cp.dataType + "Varr(" + cp.baseName + ")";
+                return cp.dataType + "Varr(" + cp.paramName + ")";
             }
         } else {
-            return cp.baseName + "Varr(" + cp.baseName + ")";
+            return cp.baseName + "Varr(" + cp.paramName + ")";
         }
     }
 
@@ -844,7 +844,7 @@ private String cpToQueryParameter(CodegenParameter cp, Set<String> imports, Map<
         }
 
         vendorExtensions.putAll(refineProp(cp, imports));
-        return cp.baseName + "QueryParam(" + cp.baseName + ")";
+        return cp.baseName + "QueryParam(" + cp.paramName + ")";
     }
 
     @Override

modules/openapi-generator/src/main/resources/scala-http4s-server/delegateArgs.mustache

@@ -1,21 +1,21 @@
 {{#pathParams}}
-      {{baseName}}: {{{vendorExtensions.x-type}}},
+      {{paramName}}: {{{vendorExtensions.x-type}}},
 {{/pathParams}}
 {{#queryParams}}
   {{#isArray}}
     {{#required}}
-      {{baseName}}: List[{{{items.vendorExtensions.x-type}}}],
+      {{paramName}}: List[{{{items.vendorExtensions.x-type}}}],
     {{/required}}
     {{^required}}
-      {{baseName}}: Option[List[{{{items.vendorExtensions.x-type}}}]],
+      {{paramName}}: Option[List[{{{items.vendorExtensions.x-type}}}]],
     {{/required}}
   {{/isArray}}
   {{^isArray}}
     {{#required}}
-      {{baseName}}: {{{vendorExtensions.x-type}}},
+      {{paramName}}: {{{vendorExtensions.x-type}}},
     {{/required}}
     {{^required}}
-      {{baseName}}: Option[{{{vendorExtensions.x-type}}}],
+      {{paramName}}: Option[{{{vendorExtensions.x-type}}}],
     {{/required}}
   {{/isArray}}
 {{/queryParams}}

modules/openapi-generator/src/main/resources/scala-http4s-server/delegateCallGeneric.mustache

@@ -1,6 +1,6 @@
 {{^authName}}
-delegate.{{operationId}}.handle(req, {{#pathParams}}{{baseName}}, {{/pathParams}}{{#queryParams}}{{baseName}}, {{/queryParams}}responses)
+delegate.{{operationId}}.handle(req, {{#pathParams}}{{paramName}}, {{/pathParams}}{{#queryParams}}{{paramName}}, {{/queryParams}}responses)
 {{/authName}}
 {{#authName}}
-delegate.{{operationId}}.handle_{{authName}}(auth, req, {{#pathParams}}{{baseName}}, {{/pathParams}}{{#queryParams}}{{baseName}}, {{/queryParams}}responses)
+delegate.{{operationId}}.handle_{{authName}}(auth, req, {{#pathParams}}{{paramName}}, {{/pathParams}}{{#queryParams}}{{paramName}}, {{/queryParams}}responses)
 {{/authName}}

modules/openapi-generator/src/main/resources/scala-http4s-server/delegateCallJson.mustache

@@ -1,6 +1,6 @@
 {{^authName}}
-  delegate.{{operationId}}.handle(req, req.asJsonDecode[{{{bodyParam.dataType}}}] , {{#pathParams}}{{baseName}}, {{/pathParams}}{{#queryParams}}{{baseName}}, {{/queryParams}}responses)
+  delegate.{{operationId}}.handle(req, req.asJsonDecode[{{{bodyParam.dataType}}}] , {{#pathParams}}{{paramName}}, {{/pathParams}}{{#queryParams}}{{paramName}}, {{/queryParams}}responses)
 {{/authName}}
 {{#authName}}
-  delegate.{{operationId}}.handle_{{authName}}(auth, req, req.asJsonDecode[{{{bodyParam.dataType}}}] , {{#pathParams}}{{baseName}}, {{/pathParams}}{{#queryParams}}{{baseName}}, {{/queryParams}}responses)
+  delegate.{{operationId}}.handle_{{authName}}(auth, req, req.asJsonDecode[{{{bodyParam.dataType}}}] , {{#pathParams}}{{paramName}}, {{/pathParams}}{{#queryParams}}{{paramName}}, {{/queryParams}}responses)
 {{/authName}}