loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix missing serverConf variable (#19859)

Browse Source 
Previously, if an operation had a 'servers' block, the template would
emit code requiring a `serverConf` local variable. Unfortunately, the
template would not emit this variable, because it was looking for a
`servers` variable in the wrong context.

This change makes the template emit an anonymous block containing a
unique server configuration for each operation.

I did not test this change beyond a simple code inspection, there are
other problems with the code generator which prevent it from running on
my API definition.
This commit is contained in:
James Ring 2024-10-16 00:45:18 -07:00 committed by GitHub
parent 21a8e4e623
commit c487a6ea18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache vendored
View File

@ -23,9 +23,6 @@ void {{classname}}::initializeServerConfigs() {
//Default server //Default server
QList<{{prefix}}ServerConfiguration> defaultConf = QList<{{prefix}}ServerConfiguration>(); QList<{{prefix}}ServerConfiguration> defaultConf = QList<{{prefix}}ServerConfiguration>();
//varying endpoint server //varying endpoint server
{{#servers}}
QList<{{prefix}}ServerConfiguration> serverConf = QList<{{prefix}}ServerConfiguration>();
{{/servers}}
{{#vendorExtensions.x-cpp-global-server-list}} {{#vendorExtensions.x-cpp-global-server-list}}
defaultConf.append({{prefix}}ServerConfiguration( defaultConf.append({{prefix}}ServerConfiguration(
QUrl("{{{url}}}"), QUrl("{{{url}}}"),
@ -42,15 +39,18 @@ void {{classname}}::initializeServerConfigs() {
_serverIndices.insert("{{nickname}}", 0); _serverIndices.insert("{{nickname}}", 0);
{{/servers}} {{/servers}}
{{#servers}} {{#servers}}
serverConf.append({{prefix}}ServerConfiguration( {
QUrl("{{{url}}}"), QList<{{prefix}}ServerConfiguration> serverConf = QList<{{prefix}}ServerConfiguration>();
"{{{description}}}{{^description}}No description provided{{/description}}", serverConf.append({{prefix}}ServerConfiguration(
{{#variables}}{{#-first}}QMap<QString, {{prefix}}ServerVariable>{ {{/-first}} QUrl("{{{url}}}"),
{"{{{name}}}", {{prefix}}ServerVariable("{{{description}}}{{^description}}No description provided{{/description}}","{{{defaultValue}}}", "{{{description}}}{{^description}}No description provided{{/description}}",
QSet<QString>{ {{#enumValues}}{"{{{.}}}"}{{#-last}} })}, {{/-last}}{{^-last}},{{/-last}}{{/enumValues}}{{^enumValues}}{"{{defaultValue}}"} })},{{/enumValues}}{{#-last}} }));{{/-last}} {{#variables}}{{#-first}}QMap<QString, {{prefix}}ServerVariable>{ {{/-first}}
{{/variables}}{{^variables}}QMap<QString, {{prefix}}ServerVariable>()));{{/variables}} {"{{{name}}}", {{prefix}}ServerVariable("{{{description}}}{{^description}}No description provided{{/description}}","{{{defaultValue}}}",
{{#-last}}_serverConfigs.insert("{{nickname}}", serverConf); QSet<QString>{ {{#enumValues}}{"{{{.}}}"}{{#-last}} })}, {{/-last}}{{^-last}},{{/-last}}{{/enumValues}}{{^enumValues}}{"{{defaultValue}}"} })},{{/enumValues}}{{#-last}} }));{{/-last}}
_serverIndices.insert("{{nickname}}", 0);{{/-last}} {{/variables}}{{^variables}}QMap<QString, {{prefix}}ServerVariable>()));{{/variables}}
{{#-last}}_serverConfigs.insert("{{nickname}}", serverConf);
_serverIndices.insert("{{nickname}}", 0);{{/-last}}
}
{{/servers}} {{/servers}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}