Skip to content

Commit ab5f224

Browse files
etherealjoyetherealjoy
authored
Support abort operation (#5114)
1 parent d111e3a commit ab5f224

8 files changed

Lines changed: 49 additions & 21 deletions

File tree

‎modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ void {{classname}}::enableResponseCompression() {
5757
isResponseCompressionEnabled = true;
5858
}
5959

60+
void {{classname}}::abortRequests(){
61+
emit abortRequestsSignal();
62+
}
63+
6064
{{#operations}}
6165
{{#operation}}
6266
void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
@@ -143,7 +147,7 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName
143147
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
144148

145149
connect(worker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
146-
150+
connect(this, &{{classname}}::abortRequestsSignal, worker, &QObject::deleteLater);
147151
worker->execute(&input);
148152
}
149153

‎modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public:
2929
void addHeaders(const QString &key, const QString &value);
3030
void enableRequestCompression();
3131
void enableResponseCompression();
32+
void abortRequests();
3233
{{#operations}}{{#operation}}
3334
void {{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/operation}}{{/operations}}
3435

@@ -53,6 +54,8 @@ signals:
5354
void {{nickname}}SignalE({{#returnType}}{{{returnType}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str);{{/operation}}{{/operations}}
5455
{{#operations}}{{#operation}}
5556
void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);{{/operation}}{{/operations}}
57+
58+
void abortRequestsSignal();
5659
};
5760

5861
{{#cppNamespaceDeclarations}}

‎samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ void PFXPetApi::enableResponseCompression() {
6565
isResponseCompressionEnabled = true;
6666
}
6767

68+
void PFXPetApi::abortRequests(){
69+
emit abortRequestsSignal();
70+
}
71+
6872
void PFXPetApi::addPet(const PFXPet &body) {
6973
QString fullPath = QString("%1://%2%3%4%5")
7074
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXPetApi::addPet(const PFXPet &body) {
8488
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
8589

8690
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback);
87-
91+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
8892
worker->execute(&input);
8993
}
9094

@@ -133,7 +137,7 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const QString &api_key) {
133137
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
134138

135139
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback);
136-
140+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
137141
worker->execute(&input);
138142
}
139143

@@ -213,7 +217,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
213217
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
214218

215219
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback);
216-
220+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
217221
worker->execute(&input);
218222
}
219223

@@ -303,7 +307,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
303307
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
304308

305309
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback);
306-
310+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
307311
worker->execute(&input);
308312
}
309313

@@ -358,7 +362,7 @@ void PFXPetApi::getPetById(const qint64 &pet_id) {
358362
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
359363

360364
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::getPetByIdCallback);
361-
365+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
362366
worker->execute(&input);
363367
}
364368

@@ -404,7 +408,7 @@ void PFXPetApi::updatePet(const PFXPet &body) {
404408
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
405409

406410
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback);
407-
411+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
408412
worker->execute(&input);
409413
}
410414

@@ -451,7 +455,7 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const QString &name, con
451455
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
452456

453457
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback);
454-
458+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
455459
worker->execute(&input);
456460
}
457461

@@ -498,7 +502,7 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const QString &additional_metad
498502
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
499503

500504
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback);
501-
505+
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
502506
worker->execute(&input);
503507
}
504508

‎samples/client/petstore/cpp-qt5/client/PFXPetApi.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class PFXPetApi : public QObject {
3939
void addHeaders(const QString &key, const QString &value);
4040
void enableRequestCompression();
4141
void enableResponseCompression();
42+
void abortRequests();
4243

4344
void addPet(const PFXPet &body);
4445
void deletePet(const qint64 &pet_id, const QString &api_key);
@@ -105,6 +106,8 @@ class PFXPetApi : public QObject {
105106
void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
106107
void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
107108
void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
109+
110+
void abortRequestsSignal();
108111
};
109112

110113
} // namespace test_namespace

‎samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ void PFXStoreApi::enableResponseCompression() {
6565
isResponseCompressionEnabled = true;
6666
}
6767

68+
void PFXStoreApi::abortRequests(){
69+
emit abortRequestsSignal();
70+
}
71+
6872
void PFXStoreApi::deleteOrder(const QString &order_id) {
6973
QString fullPath = QString("%1://%2%3%4%5")
7074
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXStoreApi::deleteOrder(const QString &order_id) {
8488
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
8589

8690
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::deleteOrderCallback);
87-
91+
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
8892
worker->execute(&input);
8993
}
9094

@@ -126,7 +130,7 @@ void PFXStoreApi::getInventory() {
126130
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
127131

128132
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getInventoryCallback);
129-
133+
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
130134
worker->execute(&input);
131135
}
132136

@@ -181,7 +185,7 @@ void PFXStoreApi::getOrderById(const qint64 &order_id) {
181185
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
182186

183187
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getOrderByIdCallback);
184-
188+
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
185189
worker->execute(&input);
186190
}
187191

@@ -227,7 +231,7 @@ void PFXStoreApi::placeOrder(const PFXOrder &body) {
227231
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
228232

229233
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::placeOrderCallback);
230-
234+
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
231235
worker->execute(&input);
232236
}
233237

‎samples/client/petstore/cpp-qt5/client/PFXStoreApi.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class PFXStoreApi : public QObject {
3838
void addHeaders(const QString &key, const QString &value);
3939
void enableRequestCompression();
4040
void enableResponseCompression();
41+
void abortRequests();
4142

4243
void deleteOrder(const QString &order_id);
4344
void getInventory();
@@ -80,6 +81,8 @@ class PFXStoreApi : public QObject {
8081
void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
8182
void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
8283
void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
84+
85+
void abortRequestsSignal();
8386
};
8487

8588
} // namespace test_namespace

‎samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ void PFXUserApi::enableResponseCompression() {
6565
isResponseCompressionEnabled = true;
6666
}
6767

68+
void PFXUserApi::abortRequests(){
69+
emit abortRequestsSignal();
70+
}
71+
6872
void PFXUserApi::createUser(const PFXUser &body) {
6973
QString fullPath = QString("%1://%2%3%4%5")
7074
.arg(_scheme)
@@ -84,7 +88,7 @@ void PFXUserApi::createUser(const PFXUser &body) {
8488
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
8589

8690
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUserCallback);
87-
91+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
8892
worker->execute(&input);
8993
}
9094

@@ -130,7 +134,7 @@ void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &body) {
130134
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
131135

132136
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithArrayInputCallback);
133-
137+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
134138
worker->execute(&input);
135139
}
136140

@@ -176,7 +180,7 @@ void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &body) {
176180
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
177181

178182
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithListInputCallback);
179-
183+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
180184
worker->execute(&input);
181185
}
182186

@@ -221,7 +225,7 @@ void PFXUserApi::deleteUser(const QString &username) {
221225
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
222226

223227
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::deleteUserCallback);
224-
228+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
225229
worker->execute(&input);
226230
}
227231

@@ -266,7 +270,7 @@ void PFXUserApi::getUserByName(const QString &username) {
266270
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
267271

268272
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::getUserByNameCallback);
269-
273+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
270274
worker->execute(&input);
271275
}
272276

@@ -321,7 +325,7 @@ void PFXUserApi::loginUser(const QString &username, const QString &password) {
321325
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
322326

323327
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::loginUserCallback);
324-
328+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
325329
worker->execute(&input);
326330
}
327331

@@ -365,7 +369,7 @@ void PFXUserApi::logoutUser() {
365369
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
366370

367371
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::logoutUserCallback);
368-
372+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
369373
worker->execute(&input);
370374
}
371375

@@ -413,7 +417,7 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &body) {
413417
foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); }
414418

415419
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::updateUserCallback);
416-
420+
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
417421
worker->execute(&input);
418422
}
419423

‎samples/client/petstore/cpp-qt5/client/PFXUserApi.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class PFXUserApi : public QObject {
3838
void addHeaders(const QString &key, const QString &value);
3939
void enableRequestCompression();
4040
void enableResponseCompression();
41+
void abortRequests();
4142

4243
void createUser(const PFXUser &body);
4344
void createUsersWithArrayInput(const QList<PFXUser> &body);
@@ -104,6 +105,8 @@ class PFXUserApi : public QObject {
104105
void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
105106
void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
106107
void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
108+
109+
void abortRequestsSignal();
107110
};
108111

109112
} // namespace test_namespace

0 commit comments

Comments
 (0)