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

[cpp-qt-client] Minor fixes (#12951)

Browse Source 
* foreach => for

* Fix PetStore.pro

* Whitespace formatting
This commit is contained in:
Martin Delille 2022-07-21 06:03:22 +02:00 committed by GitHub
parent 17c021df5b
commit cf58ac0583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 80 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache vendored
View File

@ -196,7 +196,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
if (input->vars.count() > 0) { if (input->vars.count() > 0) {
bool first = true; bool first = true;
isFormData = true; isFormData = true;
foreach (QString key, input->vars.keys()) { for (QString key : input->vars.keys()) {
if (!first) { if (!first) {
request_content.append("&"); request_content.append("&");
} }
@ -227,7 +227,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
QString new_line = "\r\n"; QString new_line = "\r\n";
// add variables // add variables
foreach (QString key, input->vars.keys()) { for (QString key : input->vars.keys()) {
// add boundary // add boundary
request_content.append(boundary_delimiter.toUtf8()); request_content.append(boundary_delimiter.toUtf8());
request_content.append(boundary.toUtf8()); request_content.append(boundary.toUtf8());
@ -329,7 +329,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
request.setSslConfiguration(*{{prefix}}HttpRequestWorker::sslDefaultConfiguration); request.setSslConfiguration(*{{prefix}}HttpRequestWorker::sslDefaultConfiguration);
} }
request.setRawHeader("User-Agent", "{{httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{apiVersion}}/cpp-qt{{/httpUserAgent}}"); request.setRawHeader("User-Agent", "{{httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{apiVersion}}/cpp-qt{{/httpUserAgent}}");
foreach (QString key, input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } for (QString key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); }
if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) { if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) {
if (!input->headers.contains("Content-Type")) { if (!input->headers.contains("Content-Type")) {

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

@ -74,7 +74,7 @@ void {{classname}}::setServerIndex(const QString &operation, int serverIndex) {
} }
void {{classname}}::setApiKey(const QString &apiKeyName, const QString &apiKey) { void {{classname}}::setApiKey(const QString &apiKeyName, const QString &apiKey) {
_apiKeys.insert(apiKeyName,apiKey); _apiKeys.insert(apiKeyName, apiKey);
} }
void {{classname}}::setBearerToken(const QString &token) { void {{classname}}::setBearerToken(const QString &token) {
@ -271,7 +271,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString paramString = (pathStyle == "matrix" && {{isExplode}}) ? pathPrefix : pathPrefix+"{{baseName}}"+pathSuffix; QString paramString = (pathStyle == "matrix" && {{isExplode}}) ? pathPrefix : pathPrefix+"{{baseName}}"+pathSuffix;
QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject(); QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject();
qint32 count = 0; qint32 count = 0;
foreach(const QString& key, parameter.keys()) { for(const QString& key : parameter.keys()) {
if (count > 0) { if (count > 0) {
pathDelimiter = (pathStyle == "matrix" && {{isExplode}}) ? ";" : getParamStyleDelimiter(pathStyle, key, {{isExplode}}); pathDelimiter = (pathStyle == "matrix" && {{isExplode}}) ? ";" : getParamStyleDelimiter(pathStyle, key, {{isExplode}});
paramString.append(pathDelimiter); paramString.append(pathDelimiter);
@ -320,7 +320,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) { if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) {
QString paramString = (pathStyle == "matrix") ? pathPrefix+"{{baseName}}"+pathSuffix : pathPrefix; QString paramString = (pathStyle == "matrix") ? pathPrefix+"{{baseName}}"+pathSuffix : pathPrefix;
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append(pathDelimiter); fullPath.append(pathDelimiter);
} }
@ -353,7 +353,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString paramString = (queryStyle == "form" && {{isExplode}}) ? "" : (queryStyle == "form" && !({{isExplode}})) ? "{{baseName}}"+querySuffix : ""; QString paramString = (queryStyle == "form" && {{isExplode}}) ? "" : (queryStyle == "form" && !({{isExplode}})) ? "{{baseName}}"+querySuffix : "";
QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject(); QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject();
qint32 count = 0; qint32 count = 0;
foreach(const QString& key, parameter.keys()) { for(const QString& key : parameter.keys()) {
if (count > 0) { if (count > 0) {
queryDelimiter = ((queryStyle == "form" || queryStyle == "deepObject") && {{isExplode}}) ? "&" : getParamStyleDelimiter(queryStyle, key, {{isExplode}}); queryDelimiter = ((queryStyle == "form" || queryStyle == "deepObject") && {{isExplode}}) ? "&" : getParamStyleDelimiter(queryStyle, key, {{isExplode}});
paramString.append(queryDelimiter); paramString.append(queryDelimiter);
@ -403,7 +403,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
{{#collectionFormat}} {{#collectionFormat}}
if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) { if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) {
if (QString("{{collectionFormat}}").indexOf("multi") == 0) { if (QString("{{collectionFormat}}").indexOf("multi") == 0) {
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (fullPath.indexOf("?") > 0) if (fullPath.indexOf("?") > 0)
fullPath.append(queryPrefix); fullPath.append(queryPrefix);
else else
@ -416,7 +416,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
else else
fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix); fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append(({{isExplode}})? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter)); fullPath.append(({{isExplode}})? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter));
} }
@ -429,7 +429,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
else else
fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix); fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append("\t"); fullPath.append("\t");
} }
@ -442,7 +442,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
else else
fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix); fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -455,7 +455,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
else else
fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix); fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -468,7 +468,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
else else
fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix); fullPath.append("?").append(queryPrefix).append("{{baseName}}").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -530,7 +530,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString headerString; QString headerString;
QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject(); QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject();
qint32 count = 0; qint32 count = 0;
foreach(const QString& key, parameter.keys()) { for (const QString& key : parameter.keys()) {
if (count > 0) { if (count > 0) {
headerString.append(","); headerString.append(",");
} }
@ -577,7 +577,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString headerString; QString headerString;
if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) { if ({{{paramName}}}{{^required}}.value(){{/required}}.size() > 0) {
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
headerString.append(","); headerString.append(",");
} }
@ -599,7 +599,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString cookieString = "{{baseName}}="; QString cookieString = "{{baseName}}=";
QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject(); QJsonObject parameter = {{paramName}}{{^required}}.value(){{/required}}.asJsonObject();
qint32 count = 0; qint32 count = 0;
foreach(const QString& key, parameter.keys()) { for (const QString& key : parameter.keys()) {
if (count > 0) { if (count > 0) {
cookieString.append(","); cookieString.append(",");
} }
@ -649,7 +649,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
QString cookieString = "{{baseName}}="; QString cookieString = "{{baseName}}=";
if ({{{paramName}}}.size() > 0) { if ({{{paramName}}}.size() > 0) {
qint32 count = 0; qint32 count = 0;
foreach ({{{baseType}}} t, {{paramName}}{{^required}}.value(){{/required}}) { for ({{{baseType}}} t : {{paramName}}{{^required}}.value(){{/required}}) {
if (count > 0) { if (count > 0) {
cookieString.append(","); cookieString.append(",");
} }
@ -697,7 +697,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
_latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}} _latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}}
_latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled); _latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled);
_latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}} _latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}}
connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback); connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -727,7 +727,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
_latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}} _latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}}
_latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled); _latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled);
_latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}} _latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}}
connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback); connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -757,7 +757,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
_latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}} _latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}}
_latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled); _latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled);
_latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}} _latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}}
connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback); connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -787,7 +787,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
_latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}} _latestWorker->setWorkingDirectory(_workingDirectory);{{#contentCompression}}
_latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled); _latestWorker->setResponseCompressionEnabled(isResponseCompressionEnabled);
_latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}} _latestWorker->setRequestCompressionEnabled(isRequestCompressionEnabled);{{/contentCompression}}
connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback); connect(_latestWorker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &{{classname}}::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -817,7 +817,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach (QJsonValue obj, jsonArray) { for (QJsonValue obj : jsonArray) {
{{{returnBaseType}}} val; {{{returnBaseType}}} val;
::{{cppNamespace}}::fromJsonValue(val, obj); ::{{cppNamespace}}::fromJsonValue(val, obj);
{{#uniqueItems}} {{#uniqueItems}}
@ -841,7 +841,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject obj = doc.object(); QJsonObject obj = doc.object();
foreach (QString key, obj.keys()) { for (QString key : obj.keys()) {
{{returnBaseType}} val; {{returnBaseType}} val;
::{{cppNamespace}}::fromJsonValue(val, obj[key]); ::{{cppNamespace}}::fromJsonValue(val, obj[key]);
output.insert(key, val); output.insert(key, val);
@ -917,8 +917,8 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
void {{classname}}::tokenAvailable(){ void {{classname}}::tokenAvailable(){
oauthToken token; oauthToken token;
switch (_OauthMethod) { switch (_OauthMethod) {
case 1: //implicit flow case 1: //implicit flow
token = _implicitFlow.getToken(_latestScope.join(" ")); token = _implicitFlow.getToken(_latestScope.join(" "));
@ -936,7 +936,7 @@ void {{classname}}::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_authFlow.removeToken(_latestScope.join(" ")); _authFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -946,7 +946,7 @@ void {{classname}}::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -956,7 +956,7 @@ void {{classname}}::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;

3
modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.cpp.mustache vendored
View File

@ -329,8 +329,7 @@ void ReplyServer::read()
QMap<QString, QString> queryParams; QMap<QString, QString> queryParams;
QPair<QString, QString> tokenPair; for (auto tokenPair : tokens) {
foreach (tokenPair, tokens) {
QString key = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.first.trimmed().toLatin1())); QString key = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.first.trimmed().toLatin1()));
QString value = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.second.trimmed().toLatin1())); QString value = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.second.trimmed().toLatin1()));
queryParams.insert(key, value); queryParams.insert(key, value);

2
samples/client/petstore/cpp-qt/PetStore/PetStore.pro
View File

@ -6,8 +6,6 @@
QT += core gui testlib network QT += core gui testlib network
QT -= gui
TARGET = PetStore TARGET = PetStore
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle

6
samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp
View File

@ -203,7 +203,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
if (input->vars.count() > 0) { if (input->vars.count() > 0) {
bool first = true; bool first = true;
isFormData = true; isFormData = true;
foreach (QString key, input->vars.keys()) { for (QString key : input->vars.keys()) {
if (!first) { if (!first) {
request_content.append("&"); request_content.append("&");
} }
@ -234,7 +234,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
QString new_line = "\r\n"; QString new_line = "\r\n";
// add variables // add variables
foreach (QString key, input->vars.keys()) { for (QString key : input->vars.keys()) {
// add boundary // add boundary
request_content.append(boundary_delimiter.toUtf8()); request_content.append(boundary_delimiter.toUtf8());
request_content.append(boundary.toUtf8()); request_content.append(boundary.toUtf8());
@ -336,7 +336,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
request.setSslConfiguration(*PFXHttpRequestWorker::sslDefaultConfiguration); request.setSslConfiguration(*PFXHttpRequestWorker::sslDefaultConfiguration);
} }
request.setRawHeader("User-Agent", "OpenAPI-Generator/1.0.0/cpp-qt"); request.setRawHeader("User-Agent", "OpenAPI-Generator/1.0.0/cpp-qt");
foreach (QString key, input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } for (QString key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); }
if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) { if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) {
if (!input->headers.contains("Content-Type")) { if (!input->headers.contains("Content-Type")) {

3
samples/client/petstore/cpp-qt/client/PFXOauth.cpp
View File

@ -327,8 +327,7 @@ void ReplyServer::read()
QMap<QString, QString> queryParams; QMap<QString, QString> queryParams;
QPair<QString, QString> tokenPair; for (auto tokenPair : tokens) {
foreach (tokenPair, tokens) {
QString key = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.first.trimmed().toLatin1())); QString key = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.first.trimmed().toLatin1()));
QString value = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.second.trimmed().toLatin1())); QString value = QUrl::fromPercentEncoding(QByteArray().append(tokenPair.second.trimmed().toLatin1()));
queryParams.insert(key, value); queryParams.insert(key, value);

56
samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
View File

@ -73,7 +73,7 @@ void PFXPetApi::setServerIndex(const QString &operation, int serverIndex) {
} }
void PFXPetApi::setApiKey(const QString &apiKeyName, const QString &apiKey) { void PFXPetApi::setApiKey(const QString &apiKeyName, const QString &apiKey) {
_apiKeys.insert(apiKeyName,apiKey); _apiKeys.insert(apiKeyName, apiKey);
} }
void PFXPetApi::setBearerToken(const QString &token) { void PFXPetApi::setBearerToken(const QString &token) {
@ -274,7 +274,7 @@ void PFXPetApi::addPet(const PFXPet &pfx_pet) {
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -363,7 +363,7 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach (QJsonValue obj, jsonArray) { for (QJsonValue obj : jsonArray) {
PFXPet val; PFXPet val;
::test_namespace::fromJsonValue(val, obj); ::test_namespace::fromJsonValue(val, obj);
output.insert(val); output.insert(val);
@ -440,7 +440,7 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const ::test_namespace::Optional
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -501,7 +501,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
queryDelimiter = getParamStyleDelimiter(queryStyle, "status", false); queryDelimiter = getParamStyleDelimiter(queryStyle, "status", false);
if (status.size() > 0) { if (status.size() > 0) {
if (QString("csv").indexOf("multi") == 0) { if (QString("csv").indexOf("multi") == 0) {
foreach (QString t, status) { for (QString t : status) {
if (fullPath.indexOf("?") > 0) if (fullPath.indexOf("?") > 0)
fullPath.append(queryPrefix); fullPath.append(queryPrefix);
else else
@ -514,7 +514,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
else else
fullPath.append("?").append(queryPrefix).append("status").append(querySuffix); fullPath.append("?").append(queryPrefix).append("status").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, status) { for (QString t : status) {
if (count > 0) { if (count > 0) {
fullPath.append((false)? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter)); fullPath.append((false)? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter));
} }
@ -527,7 +527,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
else else
fullPath.append("?").append(queryPrefix).append("status").append(querySuffix); fullPath.append("?").append(queryPrefix).append("status").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, status) { for (QString t : status) {
if (count > 0) { if (count > 0) {
fullPath.append("\t"); fullPath.append("\t");
} }
@ -540,7 +540,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
else else
fullPath.append("?").append(queryPrefix).append("status").append(querySuffix); fullPath.append("?").append(queryPrefix).append("status").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, status) { for (QString t : status) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -553,7 +553,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
else else
fullPath.append("?").append(queryPrefix).append("status").append(querySuffix); fullPath.append("?").append(queryPrefix).append("status").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, status) { for (QString t : status) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -566,7 +566,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
else else
fullPath.append("?").append(queryPrefix).append("status").append(querySuffix); fullPath.append("?").append(queryPrefix).append("status").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, status) { for (QString t : status) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -614,7 +614,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -643,7 +643,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach (QJsonValue obj, jsonArray) { for (QJsonValue obj : jsonArray) {
PFXPet val; PFXPet val;
::test_namespace::fromJsonValue(val, obj); ::test_namespace::fromJsonValue(val, obj);
output.append(val); output.append(val);
@ -685,7 +685,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
queryDelimiter = getParamStyleDelimiter(queryStyle, "tags", false); queryDelimiter = getParamStyleDelimiter(queryStyle, "tags", false);
if (tags.size() > 0) { if (tags.size() > 0) {
if (QString("csv").indexOf("multi") == 0) { if (QString("csv").indexOf("multi") == 0) {
foreach (QString t, tags) { for (QString t : tags) {
if (fullPath.indexOf("?") > 0) if (fullPath.indexOf("?") > 0)
fullPath.append(queryPrefix); fullPath.append(queryPrefix);
else else
@ -698,7 +698,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
else else
fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix); fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, tags) { for (QString t : tags) {
if (count > 0) { if (count > 0) {
fullPath.append((false)? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter)); fullPath.append((false)? queryDelimiter : QUrl::toPercentEncoding(queryDelimiter));
} }
@ -711,7 +711,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
else else
fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix); fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, tags) { for (QString t : tags) {
if (count > 0) { if (count > 0) {
fullPath.append("\t"); fullPath.append("\t");
} }
@ -724,7 +724,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
else else
fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix); fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, tags) { for (QString t : tags) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -737,7 +737,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
else else
fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix); fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, tags) { for (QString t : tags) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -750,7 +750,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
else else
fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix); fullPath.append("?").append(queryPrefix).append("tags").append(querySuffix);
qint32 count = 0; qint32 count = 0;
foreach (QString t, tags) { for (QString t : tags) {
if (count > 0) { if (count > 0) {
fullPath.append(queryDelimiter); fullPath.append(queryDelimiter);
} }
@ -798,7 +798,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -827,7 +827,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach (QJsonValue obj, jsonArray) { for (QJsonValue obj : jsonArray) {
PFXPet val; PFXPet val;
::test_namespace::fromJsonValue(val, obj); ::test_namespace::fromJsonValue(val, obj);
output.append(val); output.append(val);
@ -968,7 +968,7 @@ void PFXPetApi::updatePet(const PFXPet &pfx_pet) {
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -1078,7 +1078,7 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const ::test_namespace::
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -1188,7 +1188,7 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const ::test_namespace::Optiona
_latestWorker = new PFXHttpRequestWorker(this, _manager); _latestWorker = new PFXHttpRequestWorker(this, _manager);
_latestWorker->setTimeOut(_timeOut); _latestWorker->setTimeOut(_timeOut);
_latestWorker->setWorkingDirectory(_workingDirectory); _latestWorker->setWorkingDirectory(_workingDirectory);
connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback); connect(_latestWorker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback);
connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater); connect(this, &PFXPetApi::abortRequestsSignal, _latestWorker, &QObject::deleteLater);
connect(_latestWorker, &QObject::destroyed, [this](){ connect(_latestWorker, &QObject::destroyed, [this](){
@ -1237,8 +1237,8 @@ void PFXPetApi::uploadFileCallback(PFXHttpRequestWorker *worker) {
} }
void PFXPetApi::tokenAvailable(){ void PFXPetApi::tokenAvailable(){
oauthToken token; oauthToken token;
switch (_OauthMethod) { switch (_OauthMethod) {
case 1: //implicit flow case 1: //implicit flow
token = _implicitFlow.getToken(_latestScope.join(" ")); token = _implicitFlow.getToken(_latestScope.join(" "));
@ -1256,7 +1256,7 @@ void PFXPetApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_authFlow.removeToken(_latestScope.join(" ")); _authFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -1266,7 +1266,7 @@ void PFXPetApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -1276,7 +1276,7 @@ void PFXPetApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;

12
samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp
View File

@ -59,7 +59,7 @@ void PFXPrimitivesApi::setServerIndex(const QString &operation, int serverIndex)
} }
void PFXPrimitivesApi::setApiKey(const QString &apiKeyName, const QString &apiKey) { void PFXPrimitivesApi::setApiKey(const QString &apiKeyName, const QString &apiKey) {
_apiKeys.insert(apiKeyName,apiKey); _apiKeys.insert(apiKeyName, apiKey);
} }
void PFXPrimitivesApi::setBearerToken(const QString &token) { void PFXPrimitivesApi::setBearerToken(const QString &token) {
@ -319,8 +319,8 @@ void PFXPrimitivesApi::primitivesNumberPutCallback(PFXHttpRequestWorker *worker)
} }
void PFXPrimitivesApi::tokenAvailable(){ void PFXPrimitivesApi::tokenAvailable(){
oauthToken token; oauthToken token;
switch (_OauthMethod) { switch (_OauthMethod) {
case 1: //implicit flow case 1: //implicit flow
token = _implicitFlow.getToken(_latestScope.join(" ")); token = _implicitFlow.getToken(_latestScope.join(" "));
@ -338,7 +338,7 @@ void PFXPrimitivesApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_authFlow.removeToken(_latestScope.join(" ")); _authFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -348,7 +348,7 @@ void PFXPrimitivesApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -358,7 +358,7 @@ void PFXPrimitivesApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;

14
samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp
View File

@ -63,7 +63,7 @@ void PFXStoreApi::setServerIndex(const QString &operation, int serverIndex) {
} }
void PFXStoreApi::setApiKey(const QString &apiKeyName, const QString &apiKey) { void PFXStoreApi::setApiKey(const QString &apiKeyName, const QString &apiKey) {
_apiKeys.insert(apiKeyName,apiKey); _apiKeys.insert(apiKeyName, apiKey);
} }
void PFXStoreApi::setBearerToken(const QString &token) { void PFXStoreApi::setBearerToken(const QString &token) {
@ -326,7 +326,7 @@ void PFXStoreApi::getInventoryCallback(PFXHttpRequestWorker *worker) {
QByteArray array(json.toStdString().c_str()); QByteArray array(json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject obj = doc.object(); QJsonObject obj = doc.object();
foreach (QString key, obj.keys()) { for (QString key : obj.keys()) {
qint32 val; qint32 val;
::test_namespace::fromJsonValue(val, obj[key]); ::test_namespace::fromJsonValue(val, obj[key]);
output.insert(key, val); output.insert(key, val);
@ -460,8 +460,8 @@ void PFXStoreApi::placeOrderCallback(PFXHttpRequestWorker *worker) {
} }
void PFXStoreApi::tokenAvailable(){ void PFXStoreApi::tokenAvailable(){
oauthToken token; oauthToken token;
switch (_OauthMethod) { switch (_OauthMethod) {
case 1: //implicit flow case 1: //implicit flow
token = _implicitFlow.getToken(_latestScope.join(" ")); token = _implicitFlow.getToken(_latestScope.join(" "));
@ -479,7 +479,7 @@ void PFXStoreApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_authFlow.removeToken(_latestScope.join(" ")); _authFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -489,7 +489,7 @@ void PFXStoreApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -499,7 +499,7 @@ void PFXStoreApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;

12
samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
View File

@ -71,7 +71,7 @@ void PFXUserApi::setServerIndex(const QString &operation, int serverIndex) {
} }
void PFXUserApi::setApiKey(const QString &apiKeyName, const QString &apiKey) { void PFXUserApi::setApiKey(const QString &apiKeyName, const QString &apiKey) {
_apiKeys.insert(apiKeyName,apiKey); _apiKeys.insert(apiKeyName, apiKey);
} }
void PFXUserApi::setBearerToken(const QString &token) { void PFXUserApi::setBearerToken(const QString &token) {
@ -705,8 +705,8 @@ void PFXUserApi::updateUserCallback(PFXHttpRequestWorker *worker) {
} }
void PFXUserApi::tokenAvailable(){ void PFXUserApi::tokenAvailable(){
oauthToken token; oauthToken token;
switch (_OauthMethod) { switch (_OauthMethod) {
case 1: //implicit flow case 1: //implicit flow
token = _implicitFlow.getToken(_latestScope.join(" ")); token = _implicitFlow.getToken(_latestScope.join(" "));
@ -724,7 +724,7 @@ void PFXUserApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_authFlow.removeToken(_latestScope.join(" ")); _authFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -734,7 +734,7 @@ void PFXUserApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;
@ -744,7 +744,7 @@ void PFXUserApi::tokenAvailable(){
_latestInput.headers.insert("Authorization", "Bearer " + token.getToken()); _latestInput.headers.insert("Authorization", "Bearer " + token.getToken());
_latestWorker->execute(&_latestInput); _latestWorker->execute(&_latestInput);
}else{ }else{
_credentialFlow.removeToken(_latestScope.join(" ")); _credentialFlow.removeToken(_latestScope.join(" "));
qDebug() << "Could not retrieve a valid token"; qDebug() << "Could not retrieve a valid token";
} }
break; break;