Support abort operation (#5114)

This commit is contained in:
sunn
2020-01-27 16:00:58 +01:00
committed by GitHub
parent d111e3a359
commit ab5f224634
8 changed files with 49 additions and 21 deletions

View File

@@ -65,6 +65,10 @@ void PFXPetApi::enableResponseCompression() {
isResponseCompressionEnabled = true;
}
void PFXPetApi::abortRequests(){
emit abortRequestsSignal();
}
void PFXPetApi::addPet(const PFXPet &body) {
QString fullPath = QString("%1://%2%3%4%5")
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXPetApi::addPet(const PFXPet &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -133,7 +137,7 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const QString &api_key) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -213,7 +217,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -303,7 +307,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -358,7 +362,7 @@ void PFXPetApi::getPetById(const qint64 &pet_id) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::getPetByIdCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -404,7 +408,7 @@ void PFXPetApi::updatePet(const PFXPet &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -451,7 +455,7 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const QString &name, con
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -498,7 +502,7 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const QString &additional_metad
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback);
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}

View File

@@ -39,6 +39,7 @@ public:
void addHeaders(const QString &key, const QString &value);
void enableRequestCompression();
void enableResponseCompression();
void abortRequests();
void addPet(const PFXPet &body);
void deletePet(const qint64 &pet_id, const QString &api_key);
@@ -105,6 +106,8 @@ signals:
void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void abortRequestsSignal();
};
} // namespace test_namespace

View File

@@ -65,6 +65,10 @@ void PFXStoreApi::enableResponseCompression() {
isResponseCompressionEnabled = true;
}
void PFXStoreApi::abortRequests(){
emit abortRequestsSignal();
}
void PFXStoreApi::deleteOrder(const QString &order_id) {
QString fullPath = QString("%1://%2%3%4%5")
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXStoreApi::deleteOrder(const QString &order_id) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::deleteOrderCallback);
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -126,7 +130,7 @@ void PFXStoreApi::getInventory() {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getInventoryCallback);
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -181,7 +185,7 @@ void PFXStoreApi::getOrderById(const qint64 &order_id) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getOrderByIdCallback);
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -227,7 +231,7 @@ void PFXStoreApi::placeOrder(const PFXOrder &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::placeOrderCallback);
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}

View File

@@ -38,6 +38,7 @@ public:
void addHeaders(const QString &key, const QString &value);
void enableRequestCompression();
void enableResponseCompression();
void abortRequests();
void deleteOrder(const QString &order_id);
void getInventory();
@@ -80,6 +81,8 @@ signals:
void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void abortRequestsSignal();
};
} // namespace test_namespace

View File

@@ -65,6 +65,10 @@ void PFXUserApi::enableResponseCompression() {
isResponseCompressionEnabled = true;
}
void PFXUserApi::abortRequests(){
emit abortRequestsSignal();
}
void PFXUserApi::createUser(const PFXUser &body) {
QString fullPath = QString("%1://%2%3%4%5")
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXUserApi::createUser(const PFXUser &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUserCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -130,7 +134,7 @@ void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithArrayInputCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -176,7 +180,7 @@ void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithListInputCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -221,7 +225,7 @@ void PFXUserApi::deleteUser(const QString &username) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::deleteUserCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -266,7 +270,7 @@ void PFXUserApi::getUserByName(const QString &username) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::getUserByNameCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -321,7 +325,7 @@ void PFXUserApi::loginUser(const QString &username, const QString &password) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::loginUserCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -365,7 +369,7 @@ void PFXUserApi::logoutUser() {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::logoutUserCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}
@@ -413,7 +417,7 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &body) {
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::updateUserCallback);
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
worker->execute(&input);
}

View File

@@ -38,6 +38,7 @@ public:
void addHeaders(const QString &key, const QString &value);
void enableRequestCompression();
void enableResponseCompression();
void abortRequests();
void createUser(const PFXUser &body);
void createUsersWithArrayInput(const QList<PFXUser> &body);
@@ -104,6 +105,8 @@ signals:
void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
void abortRequestsSignal();
};
} // namespace test_namespace