loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-06 15:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
donilg 2025-07-02 12:29:33 +05:00 committed by GitHub
parent 050dcae3ab
commit af6ab0ed0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -807,12 +807,12 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC
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 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC
}
vendorExtensions.putAll(refineProp(cp, imports));
return cp.baseName + "QueryParam(" + cp.baseName + ")";
return cp.baseName + "QueryParam(" + cp.paramName + ")";
}
@Override

10
modules/openapi-generator/src/main/resources/scala-http4s-server/delegateArgs.mustache vendored
View File

@ -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}}

4
modules/openapi-generator/src/main/resources/scala-http4s-server/delegateCallGeneric.mustache vendored
View File

@ -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}}

4
modules/openapi-generator/src/main/resources/scala-http4s-server/delegateCallJson.mustache vendored
View File

@ -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}}