Skip to content

[C++][Qt] update petstore to 3.0 spec #12124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 3 commits into from
Apr 13, 2022
Merged

[C++][Qt] update petstore to 3.0 spec #12124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bb72f0
test update sampels
wing328 Apr 12, 2022
ccffc4e
update samples
wing328 Apr 12, 2022
d479147
add file
wing328 Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update samples
  • Loading branch information
@wing328
wing328 committed Apr 12, 2022
commit ccffc4e2c0ed1595d18718333ebf38d0704e09d2
8 changes: 4 additions & 4 deletions samples/client/petstore/cpp-qt/client/PFXPet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ class PFXPet : public PFXObject {
bool is_tags_Set() const;
bool is_tags_Valid() const;

Q_DECL_DEPRECATED QString getStatus() const;
Q_DECL_DEPRECATED void setStatus(const QString &status);
Q_DECL_DEPRECATED bool is_status_Set() const;
Q_DECL_DEPRECATED bool is_status_Valid() const;
QString getStatus() const;
void setStatus(const QString &status);
bool is_status_Set() const;
bool is_status_Valid() const;

virtual bool isSet() const override;
virtual bool isValid() const override;
Expand Down
18 changes: 10 additions & 8 deletions samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,11 @@ void PFXPetApi::addPetCallback(PFXHttpRequestWorker *worker) {
if (worker->error_type != QNetworkReply::NoError) {
error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response));
}
PFXPet output(QString(worker->response));
worker->deleteLater();

if (worker->error_type == QNetworkReply::NoError) {
emit addPetSignal(output);
emit addPetSignalFull(worker, output);
emit addPetSignal();
emit addPetSignalFull(worker);
} else if(worker->error_type == QNetworkReply::AuthenticationRequiredError){
connect(&_implicitFlow, SIGNAL(tokenReceived()), this, SLOT(tokenAvailable()));
QStringList scope;
Expand All @@ -314,7 +313,7 @@ void PFXPetApi::addPetCallback(PFXHttpRequestWorker *worker) {


} else {
emit addPetSignalE(output, error_type, error_str);
emit addPetSignalE(error_type, error_str);
emit addPetSignalEFull(worker, error_type, error_str);
}
}
Expand Down Expand Up @@ -545,6 +544,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
_authFlow.unlink();
_credentialFlow.unlink();
QStringList scope;
scope.append("write:pets");
scope.append("read:pets");
auto token = _implicitFlow.getToken(scope.join(" "));
if(token.isValid())
Expand Down Expand Up @@ -595,6 +595,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) {
} else if(worker->error_type == QNetworkReply::AuthenticationRequiredError){
connect(&_implicitFlow, SIGNAL(tokenReceived()), this, SLOT(tokenAvailable()));
QStringList scope;
scope.append("write:pets");
scope.append("read:pets");
QString scopeStr = scope.join(" ");
QString authorizationUrl("http://petstore.swagger.io/api/oauth/dialog");
Expand Down Expand Up @@ -727,6 +728,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
_authFlow.unlink();
_credentialFlow.unlink();
QStringList scope;
scope.append("write:pets");
scope.append("read:pets");
auto token = _implicitFlow.getToken(scope.join(" "));
if(token.isValid())
Expand Down Expand Up @@ -777,6 +779,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) {
} else if(worker->error_type == QNetworkReply::AuthenticationRequiredError){
connect(&_implicitFlow, SIGNAL(tokenReceived()), this, SLOT(tokenAvailable()));
QStringList scope;
scope.append("write:pets");
scope.append("read:pets");
QString scopeStr = scope.join(" ");
QString authorizationUrl("http://petstore.swagger.io/api/oauth/dialog");
Expand Down Expand Up @@ -927,12 +930,11 @@ void PFXPetApi::updatePetCallback(PFXHttpRequestWorker *worker) {
if (worker->error_type != QNetworkReply::NoError) {
error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response));
}
PFXPet output(QString(worker->response));
worker->deleteLater();

if (worker->error_type == QNetworkReply::NoError) {
emit updatePetSignal(output);
emit updatePetSignalFull(worker, output);
emit updatePetSignal();
emit updatePetSignalFull(worker);
} else if(worker->error_type == QNetworkReply::AuthenticationRequiredError){
connect(&_implicitFlow, SIGNAL(tokenReceived()), this, SLOT(tokenAvailable()));
QStringList scope;
Expand All @@ -946,7 +948,7 @@ void PFXPetApi::updatePetCallback(PFXHttpRequestWorker *worker) {


} else {
emit updatePetSignalE(output, error_type, error_str);
emit updatePetSignalE(error_type, error_str);
emit updatePetSignalEFull(worker, error_type, error_str);
}
}
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/cpp-qt/client/PFXPetApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,30 +137,30 @@ class PFXPetApi : public QObject {

signals:

void addPetSignal(PFXPet summary);
void addPetSignal();
void deletePetSignal();
void findPetsByStatusSignal(QList<PFXPet> summary);
void findPetsByTagsSignal(QList<PFXPet> summary);
void getPetByIdSignal(PFXPet summary);
void updatePetSignal(PFXPet summary);
void updatePetSignal();
void updatePetWithFormSignal();
void uploadFileSignal(PFXApiResponse summary);

void addPetSignalFull(PFXHttpRequestWorker *worker, PFXPet summary);
void addPetSignalFull(PFXHttpRequestWorker *worker);
void deletePetSignalFull(PFXHttpRequestWorker *worker);
void findPetsByStatusSignalFull(PFXHttpRequestWorker *worker, QList<PFXPet> summary);
void findPetsByTagsSignalFull(PFXHttpRequestWorker *worker, QList<PFXPet> summary);
void getPetByIdSignalFull(PFXHttpRequestWorker *worker, PFXPet summary);
void updatePetSignalFull(PFXHttpRequestWorker *worker, PFXPet summary);
void updatePetSignalFull(PFXHttpRequestWorker *worker);
void updatePetWithFormSignalFull(PFXHttpRequestWorker *worker);
void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary);

void addPetSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str);
void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByStatusSignalE(QList<PFXPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByTagsSignalE(QList<PFXPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str);

Expand Down
24 changes: 0 additions & 24 deletions samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,6 @@ QString PFXUserApi::getParamStyleDelimiter(const QString &style, const QString &
void PFXUserApi::createUser(const PFXUser &pfx_user) {
QString fullPath = QString(_serverConfigs["createUser"][_serverIndices.value("createUser")].URL()+"/user");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}

PFXHttpRequestWorker *worker = new PFXHttpRequestWorker(this, _manager);
worker->setTimeOut(_timeOut);
worker->setWorkingDirectory(_workingDirectory);
Expand Down Expand Up @@ -285,10 +281,6 @@ void PFXUserApi::createUserCallback(PFXHttpRequestWorker *worker) {
void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &pfx_user) {
QString fullPath = QString(_serverConfigs["createUsersWithArrayInput"][_serverIndices.value("createUsersWithArrayInput")].URL()+"/user/createWithArray");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}

PFXHttpRequestWorker *worker = new PFXHttpRequestWorker(this, _manager);
worker->setTimeOut(_timeOut);
worker->setWorkingDirectory(_workingDirectory);
Expand Down Expand Up @@ -341,10 +333,6 @@ void PFXUserApi::createUsersWithArrayInputCallback(PFXHttpRequestWorker *worker)
void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &pfx_user) {
QString fullPath = QString(_serverConfigs["createUsersWithListInput"][_serverIndices.value("createUsersWithListInput")].URL()+"/user/createWithList");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}

PFXHttpRequestWorker *worker = new PFXHttpRequestWorker(this, _manager);
worker->setTimeOut(_timeOut);
worker->setWorkingDirectory(_workingDirectory);
Expand Down Expand Up @@ -397,10 +385,6 @@ void PFXUserApi::createUsersWithListInputCallback(PFXHttpRequestWorker *worker)
void PFXUserApi::deleteUser(const QString &username) {
QString fullPath = QString(_serverConfigs["deleteUser"][_serverIndices.value("deleteUser")].URL()+"/user/{username}");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}


{
QString usernamePathParam("{");
Expand Down Expand Up @@ -607,10 +591,6 @@ void PFXUserApi::loginUserCallback(PFXHttpRequestWorker *worker) {
void PFXUserApi::logoutUser() {
QString fullPath = QString(_serverConfigs["logoutUser"][_serverIndices.value("logoutUser")].URL()+"/user/logout");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}

PFXHttpRequestWorker *worker = new PFXHttpRequestWorker(this, _manager);
worker->setTimeOut(_timeOut);
worker->setWorkingDirectory(_workingDirectory);
Expand Down Expand Up @@ -659,10 +639,6 @@ void PFXUserApi::logoutUserCallback(PFXHttpRequestWorker *worker) {
void PFXUserApi::updateUser(const QString &username, const PFXUser &pfx_user) {
QString fullPath = QString(_serverConfigs["updateUser"][_serverIndices.value("updateUser")].URL()+"/user/{username}");

if (_apiKeys.contains("api_key")) {
addHeaders("api_key",_apiKeys.find("api_key").value());
}


{
QString usernamePathParam("{");
Expand Down