From 3a731363ff886bb5b442f93142caafa689795368 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Fri, 27 Jul 2018 10:40:04 +0200 Subject: [PATCH 01/10] Remove warnings and add custom request sending --- .../CppQt5QHttpEngineServerCodegen.java | 2 +- .../apihandler.h.mustache | 6 +-- .../apirequest.cpp.mustache | 17 ++++++- .../apirequest.h.mustache | 16 +++++-- .../apirouter.cpp.mustache | 6 +-- .../helpers-header.mustache | 6 +-- .../model-body.mustache | 2 +- .../model-header.mustache | 8 ++-- .../server/src/handlers/OAIApiRouter.cpp | 6 +-- .../server/src/handlers/OAIPetApiHandler.h | 6 +-- .../server/src/handlers/OAIStoreApiHandler.h | 6 +-- .../server/src/handlers/OAIUserApiHandler.h | 6 +-- .../server/src/models/OAIApiResponse.cpp | 6 +-- .../server/src/models/OAIApiResponse.h | 12 ++--- .../server/src/models/OAICategory.cpp | 4 +- .../server/src/models/OAICategory.h | 10 ++--- .../server/src/models/OAIHelpers.h | 6 +-- .../server/src/models/OAIOrder.cpp | 12 ++--- .../server/src/models/OAIOrder.h | 18 ++++---- .../server/src/models/OAIPet.cpp | 12 ++--- .../server/src/models/OAIPet.h | 18 ++++---- .../server/src/models/OAITag.cpp | 4 +- .../server/src/models/OAITag.h | 10 ++--- .../server/src/models/OAIUser.cpp | 16 +++---- .../server/src/models/OAIUser.h | 22 ++++----- .../server/src/requests/OAIPetApiRequest.cpp | 45 +++++++++++++++---- .../server/src/requests/OAIPetApiRequest.h | 16 +++++-- .../src/requests/OAIStoreApiRequest.cpp | 29 +++++++++--- .../server/src/requests/OAIStoreApiRequest.h | 16 +++++-- .../server/src/requests/OAIUserApiRequest.cpp | 45 +++++++++++++++---- .../server/src/requests/OAIUserApiRequest.h | 16 +++++-- 31 files changed, 259 insertions(+), 145 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index ace3b24b9b5a..07ca94e479c0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -234,7 +234,7 @@ public String getName() { } /** - * Returns human-friendly help for the generator. Provide the consumer with help + * Returns human-friendly help for the generator. Provide the consumer with help * tips, parameters here * * @return A string value for the help message diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache index e37a99bd7b24..991b3ff8d112 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache @@ -1,6 +1,6 @@ {{>licenseInfo}} -#ifndef _{{prefix}}_{{classname}}Handler_H_ -#define _{{prefix}}_{{classname}}Handler_H_ +#ifndef {{prefix}}_{{classname}}Handler_H +#define {{prefix}}_{{classname}}Handler_H #include @@ -30,4 +30,4 @@ public slots: } {{/cppNamespaceDeclarations}} -#endif // _{{prefix}}_{{classname}}Handler_H_ +#endif // {{prefix}}_{{classname}}Handler_H diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index e9430f5b256f..9d55f6ba0e06 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -21,10 +21,15 @@ namespace {{this}} { } QMap -{{classname}}Request::getDefaultHeaders(){ +{{classname}}Request::getDefaultHeaders() const { return defaultHeaders; } +void {{classname}}Request::setHeaders(QMultiMap headers){ + +} + + QHttpEngine::Socket* {{classname}}Request::getRawSocket(){ return socket; } @@ -98,6 +103,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}{{{returnType}}} res{{/returnType}}){ + {{#returnType}}Q_UNUSED(res);{{/returnType}} socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -108,7 +114,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + {{#returnType}}Q_UNUSED(res);{{/returnType}} socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -117,7 +124,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} } {{/operation}}{{/operations}} +void {{classname}}Request::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ +} + +void {{classname}}Request::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ + +} {{#cppNamespaceDeclarations}} } diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache index 994f68350cc8..f8edceb28ff5 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache @@ -1,9 +1,10 @@ {{>licenseInfo}} -#ifndef _{{prefix}}_{{classname}}Request_H_ -#define _{{prefix}}_{{classname}}Request_H_ +#ifndef {{prefix}}_{{classname}}Request_H +#define {{prefix}}_{{classname}}Request_H #include #include +#include #include #include @@ -33,9 +34,16 @@ public: {{#operations}}{{#operation}}void {{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str); {{/operation}}{{/operations}} - QMap getDefaultHeaders(); + void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); + + void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); + + QMap getDefaultHeaders() const; + QHttpEngine::Socket* getRawSocket(); + void setHeaders(QMultiMap headers); + signals: {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{/operation}}{{/operations}} @@ -50,4 +58,4 @@ private: } {{/cppNamespaceDeclarations}} -#endif // _{{prefix}}_{{classname}}Request_H_ +#endif // {{prefix}}_{{classname}}Request_H diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache index e789b68a2b96..06fd17220e0e 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache @@ -58,10 +58,8 @@ void ApiRouter::setUpRoutes() { void ApiRouter::processRequest(QHttpEngine::Socket *socket){ if (Routes.contains(socket->path())) { - auto itr = Routes.find(socket->path()); - while (itr != Routes.end() && itr.key() == socket->path()) { - itr.value().operator()(socket); - ++itr; + for(auto endpoints : Routes.values(socket->path())) { + endpoints.operator()(socket); } } else { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#pathParams}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache index 92f0b96c1799..55d671f2e654 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache @@ -1,6 +1,6 @@ {{>licenseInfo}} -#ifndef {{prefix}}_HELPERS_H -#define {{prefix}}_HELPERS_H +#ifndef __{{prefix}}_HELPERS_H__ +#define __{{prefix}}_HELPERS_H__ #include #include @@ -141,4 +141,4 @@ namespace {{this}} { } {{/cppNamespaceDeclarations}} -#endif // {{prefix}}_HELPERS_H +#endif // __{{prefix}}_HELPERS_H__ diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache index 6ba6d398b00a..b83b21a0127c 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache @@ -90,7 +90,7 @@ QJsonObject {{#vars}} {{{dataType}}} -{{classname}}::{{getter}}() { +{{classname}}::{{getter}}() const { return {{name}}; } void diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache index 8050d281ecc5..4c8ec537f870 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache @@ -5,8 +5,8 @@ * {{description}} */ -#ifndef {{classname}}_H_ -#define {{classname}}_H_ +#ifndef {{classname}}_H +#define {{classname}}_H #include @@ -35,7 +35,7 @@ public: void fromJson(QString jsonString) override; {{#vars}} - {{{dataType}}} {{getter}}(); + {{{dataType}}} {{getter}}() const; void {{setter}}(const {{{dataType}}} &{{name}}); {{/vars}} @@ -53,6 +53,6 @@ private: } {{/cppNamespaceDeclarations}} -#endif /* {{classname}}_H_ */ +#endif // {{classname}}_H {{/model}} {{/models}} diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp index 2625861ec48e..e45ee728700d 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp @@ -133,10 +133,8 @@ void ApiRouter::setUpRoutes() { void ApiRouter::processRequest(QHttpEngine::Socket *socket){ if (Routes.contains(socket->path())) { - auto itr = Routes.find(socket->path()); - while (itr != Routes.end() && itr.key() == socket->path()) { - itr.value().operator()(socket); - ++itr; + for(auto endpoints : Routes.values(socket->path())) { + endpoints.operator()(socket); } } else { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index 95d08bb89bf6..8a7ac9d02c98 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -10,8 +10,8 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIPetApiHandler_H_ -#define _OAI_OAIPetApiHandler_H_ +#ifndef OAI_OAIPetApiHandler_H +#define OAI_OAIPetApiHandler_H #include @@ -46,4 +46,4 @@ public slots: } -#endif // _OAI_OAIPetApiHandler_H_ +#endif // OAI_OAIPetApiHandler_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h index c0b1d3814de0..791ca0b63b8c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h @@ -10,8 +10,8 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIStoreApiHandler_H_ -#define _OAI_OAIStoreApiHandler_H_ +#ifndef OAI_OAIStoreApiHandler_H +#define OAI_OAIStoreApiHandler_H #include @@ -41,4 +41,4 @@ public slots: } -#endif // _OAI_OAIStoreApiHandler_H_ +#endif // OAI_OAIStoreApiHandler_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h index 2f43980d8774..6cce891da655 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h @@ -10,8 +10,8 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIUserApiHandler_H_ -#define _OAI_OAIUserApiHandler_H_ +#ifndef OAI_OAIUserApiHandler_H +#define OAI_OAIUserApiHandler_H #include @@ -45,4 +45,4 @@ public slots: } -#endif // _OAI_OAIUserApiHandler_H_ +#endif // OAI_OAIUserApiHandler_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp index 8a65e8f339e7..7bba2a9468dd 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp @@ -83,7 +83,7 @@ OAIApiResponse::asJsonObject() const { } qint32 -OAIApiResponse::getCode() { +OAIApiResponse::getCode() const { return code; } void @@ -93,7 +93,7 @@ OAIApiResponse::setCode(const qint32 &code) { } QString -OAIApiResponse::getType() { +OAIApiResponse::getType() const { return type; } void @@ -103,7 +103,7 @@ OAIApiResponse::setType(const QString &type) { } QString -OAIApiResponse::getMessage() { +OAIApiResponse::getMessage() const { return message; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h index 1fc574e0b3fb..144c0c402943 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h @@ -16,8 +16,8 @@ * Describes the result of uploading an image resource */ -#ifndef OAIApiResponse_H_ -#define OAIApiResponse_H_ +#ifndef OAIApiResponse_H +#define OAIApiResponse_H #include @@ -40,13 +40,13 @@ class OAIApiResponse: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint32 getCode(); + qint32 getCode() const; void setCode(const qint32 &code); - QString getType(); + QString getType() const; void setType(const QString &type); - QString getMessage(); + QString getMessage() const; void setMessage(const QString &message); virtual bool isSet() const override; @@ -65,4 +65,4 @@ class OAIApiResponse: public OAIObject { } -#endif /* OAIApiResponse_H_ */ +#endif // OAIApiResponse_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp index 65fe716676e7..c70d263a5a01 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp @@ -77,7 +77,7 @@ OAICategory::asJsonObject() const { } qint64 -OAICategory::getId() { +OAICategory::getId() const { return id; } void @@ -87,7 +87,7 @@ OAICategory::setId(const qint64 &id) { } QString -OAICategory::getName() { +OAICategory::getName() const { return name; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h index bd84895cf556..027d83c6db03 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h @@ -16,8 +16,8 @@ * A category for a pet */ -#ifndef OAICategory_H_ -#define OAICategory_H_ +#ifndef OAICategory_H +#define OAICategory_H #include @@ -40,10 +40,10 @@ class OAICategory: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint64 getId(); + qint64 getId() const; void setId(const qint64 &id); - QString getName(); + QString getName() const; void setName(const QString &name); virtual bool isSet() const override; @@ -59,4 +59,4 @@ class OAICategory: public OAIObject { } -#endif /* OAICategory_H_ */ +#endif // OAICategory_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h index 77722b829433..bf4e559aa36b 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h @@ -10,8 +10,8 @@ * Do not edit the class manually. */ -#ifndef OAI_HELPERS_H -#define OAI_HELPERS_H +#ifndef __OAI_HELPERS_H__ +#define __OAI_HELPERS_H__ #include #include @@ -148,4 +148,4 @@ namespace OpenAPI { } -#endif // OAI_HELPERS_H +#endif // __OAI_HELPERS_H__ diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp index a022d5e6434c..7afaa063a291 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp @@ -101,7 +101,7 @@ OAIOrder::asJsonObject() const { } qint64 -OAIOrder::getId() { +OAIOrder::getId() const { return id; } void @@ -111,7 +111,7 @@ OAIOrder::setId(const qint64 &id) { } qint64 -OAIOrder::getPetId() { +OAIOrder::getPetId() const { return pet_id; } void @@ -121,7 +121,7 @@ OAIOrder::setPetId(const qint64 &pet_id) { } qint32 -OAIOrder::getQuantity() { +OAIOrder::getQuantity() const { return quantity; } void @@ -131,7 +131,7 @@ OAIOrder::setQuantity(const qint32 &quantity) { } QDateTime -OAIOrder::getShipDate() { +OAIOrder::getShipDate() const { return ship_date; } void @@ -141,7 +141,7 @@ OAIOrder::setShipDate(const QDateTime &ship_date) { } QString -OAIOrder::getStatus() { +OAIOrder::getStatus() const { return status; } void @@ -151,7 +151,7 @@ OAIOrder::setStatus(const QString &status) { } bool -OAIOrder::isComplete() { +OAIOrder::isComplete() const { return complete; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h index 6eb1bc9ce64c..561aebd8a4f8 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h @@ -16,8 +16,8 @@ * An order for a pets from the pet store */ -#ifndef OAIOrder_H_ -#define OAIOrder_H_ +#ifndef OAIOrder_H +#define OAIOrder_H #include @@ -41,22 +41,22 @@ class OAIOrder: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint64 getId(); + qint64 getId() const; void setId(const qint64 &id); - qint64 getPetId(); + qint64 getPetId() const; void setPetId(const qint64 &pet_id); - qint32 getQuantity(); + qint32 getQuantity() const; void setQuantity(const qint32 &quantity); - QDateTime getShipDate(); + QDateTime getShipDate() const; void setShipDate(const QDateTime &ship_date); - QString getStatus(); + QString getStatus() const; void setStatus(const QString &status); - bool isComplete(); + bool isComplete() const; void setComplete(const bool &complete); virtual bool isSet() const override; @@ -84,4 +84,4 @@ class OAIOrder: public OAIObject { } -#endif /* OAIOrder_H_ */ +#endif // OAIOrder_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp index 2f36b66a300f..97cb3399151c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp @@ -103,7 +103,7 @@ OAIPet::asJsonObject() const { } qint64 -OAIPet::getId() { +OAIPet::getId() const { return id; } void @@ -113,7 +113,7 @@ OAIPet::setId(const qint64 &id) { } OAICategory -OAIPet::getCategory() { +OAIPet::getCategory() const { return category; } void @@ -123,7 +123,7 @@ OAIPet::setCategory(const OAICategory &category) { } QString -OAIPet::getName() { +OAIPet::getName() const { return name; } void @@ -133,7 +133,7 @@ OAIPet::setName(const QString &name) { } QList -OAIPet::getPhotoUrls() { +OAIPet::getPhotoUrls() const { return photo_urls; } void @@ -143,7 +143,7 @@ OAIPet::setPhotoUrls(const QList &photo_urls) { } QList -OAIPet::getTags() { +OAIPet::getTags() const { return tags; } void @@ -153,7 +153,7 @@ OAIPet::setTags(const QList &tags) { } QString -OAIPet::getStatus() { +OAIPet::getStatus() const { return status; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h index b301f02c47d1..948040eb1e4b 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h @@ -16,8 +16,8 @@ * A pet for sale in the pet store */ -#ifndef OAIPet_H_ -#define OAIPet_H_ +#ifndef OAIPet_H +#define OAIPet_H #include @@ -43,22 +43,22 @@ class OAIPet: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint64 getId(); + qint64 getId() const; void setId(const qint64 &id); - OAICategory getCategory(); + OAICategory getCategory() const; void setCategory(const OAICategory &category); - QString getName(); + QString getName() const; void setName(const QString &name); - QList getPhotoUrls(); + QList getPhotoUrls() const; void setPhotoUrls(const QList &photo_urls); - QList getTags(); + QList getTags() const; void setTags(const QList &tags); - QString getStatus(); + QString getStatus() const; void setStatus(const QString &status); virtual bool isSet() const override; @@ -86,4 +86,4 @@ class OAIPet: public OAIObject { } -#endif /* OAIPet_H_ */ +#endif // OAIPet_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp index 05343cb5e779..e8f1a69972bb 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp @@ -77,7 +77,7 @@ OAITag::asJsonObject() const { } qint64 -OAITag::getId() { +OAITag::getId() const { return id; } void @@ -87,7 +87,7 @@ OAITag::setId(const qint64 &id) { } QString -OAITag::getName() { +OAITag::getName() const { return name; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h index 7e8dace76c19..c6deb9cfef7d 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h @@ -16,8 +16,8 @@ * A tag for a pet */ -#ifndef OAITag_H_ -#define OAITag_H_ +#ifndef OAITag_H +#define OAITag_H #include @@ -40,10 +40,10 @@ class OAITag: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint64 getId(); + qint64 getId() const; void setId(const qint64 &id); - QString getName(); + QString getName() const; void setName(const QString &name); virtual bool isSet() const override; @@ -59,4 +59,4 @@ class OAITag: public OAIObject { } -#endif /* OAITag_H_ */ +#endif // OAITag_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp index 3a904b343c66..375c8b3220c6 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp @@ -113,7 +113,7 @@ OAIUser::asJsonObject() const { } qint64 -OAIUser::getId() { +OAIUser::getId() const { return id; } void @@ -123,7 +123,7 @@ OAIUser::setId(const qint64 &id) { } QString -OAIUser::getUsername() { +OAIUser::getUsername() const { return username; } void @@ -133,7 +133,7 @@ OAIUser::setUsername(const QString &username) { } QString -OAIUser::getFirstName() { +OAIUser::getFirstName() const { return first_name; } void @@ -143,7 +143,7 @@ OAIUser::setFirstName(const QString &first_name) { } QString -OAIUser::getLastName() { +OAIUser::getLastName() const { return last_name; } void @@ -153,7 +153,7 @@ OAIUser::setLastName(const QString &last_name) { } QString -OAIUser::getEmail() { +OAIUser::getEmail() const { return email; } void @@ -163,7 +163,7 @@ OAIUser::setEmail(const QString &email) { } QString -OAIUser::getPassword() { +OAIUser::getPassword() const { return password; } void @@ -173,7 +173,7 @@ OAIUser::setPassword(const QString &password) { } QString -OAIUser::getPhone() { +OAIUser::getPhone() const { return phone; } void @@ -183,7 +183,7 @@ OAIUser::setPhone(const QString &phone) { } qint32 -OAIUser::getUserStatus() { +OAIUser::getUserStatus() const { return user_status; } void diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h index 495cd88fa7e2..fce595439c2b 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h @@ -16,8 +16,8 @@ * A User who is purchasing from the pet store */ -#ifndef OAIUser_H_ -#define OAIUser_H_ +#ifndef OAIUser_H +#define OAIUser_H #include @@ -40,28 +40,28 @@ class OAIUser: public OAIObject { void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; - qint64 getId(); + qint64 getId() const; void setId(const qint64 &id); - QString getUsername(); + QString getUsername() const; void setUsername(const QString &username); - QString getFirstName(); + QString getFirstName() const; void setFirstName(const QString &first_name); - QString getLastName(); + QString getLastName() const; void setLastName(const QString &last_name); - QString getEmail(); + QString getEmail() const; void setEmail(const QString &email); - QString getPassword(); + QString getPassword() const; void setPassword(const QString &password); - QString getPhone(); + QString getPhone() const; void setPhone(const QString &phone); - qint32 getUserStatus(); + qint32 getUserStatus() const; void setUserStatus(const qint32 &user_status); virtual bool isSet() const override; @@ -95,4 +95,4 @@ class OAIUser: public OAIObject { } -#endif /* OAIUser_H_ */ +#endif // OAIUser_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp index 8f619d3351d9..9bd90197be7c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp @@ -30,10 +30,15 @@ OAIPetApiRequest::~OAIPetApiRequest(){ } QMap -OAIPetApiRequest::getDefaultHeaders(){ +OAIPetApiRequest::getDefaultHeaders() const { return defaultHeaders; } +void OAIPetApiRequest::setHeaders(QMultiMap headers){ + +} + + QHttpEngine::Socket* OAIPetApiRequest::getRawSocket(){ return socket; } @@ -168,6 +173,7 @@ void OAIPetApiRequest::uploadFileRequest(QString pet_idstr){ void OAIPetApiRequest::addPetResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -175,6 +181,7 @@ void OAIPetApiRequest::addPetResponse(){ } } void OAIPetApiRequest::deletePetResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -182,6 +189,7 @@ void OAIPetApiRequest::deletePetResponse(){ } } void OAIPetApiRequest::findPetsByStatusResponse(QList res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -189,6 +197,7 @@ void OAIPetApiRequest::findPetsByStatusResponse(QList res){ } } void OAIPetApiRequest::findPetsByTagsResponse(QList res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -196,6 +205,7 @@ void OAIPetApiRequest::findPetsByTagsResponse(QList res){ } } void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -203,6 +213,7 @@ void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ } } void OAIPetApiRequest::updatePetResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -210,6 +221,7 @@ void OAIPetApiRequest::updatePetResponse(){ } } void OAIPetApiRequest::updatePetWithFormResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -217,6 +229,7 @@ void OAIPetApiRequest::updatePetWithFormResponse(){ } } void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -227,7 +240,8 @@ void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ void OAIPetApiRequest::addPetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -236,7 +250,8 @@ void OAIPetApiRequest::addPetError(QNetworkReply::NetworkError error_type, QStri } void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -245,7 +260,8 @@ void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QS } void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -254,7 +270,8 @@ void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::N } void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -263,7 +280,8 @@ void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::Net } void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -272,7 +290,8 @@ void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError e } void OAIPetApiRequest::updatePetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -281,7 +300,8 @@ void OAIPetApiRequest::updatePetError(QNetworkReply::NetworkError error_type, QS } void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -290,7 +310,8 @@ void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_ } void OAIPetApiRequest::uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -299,6 +320,12 @@ void OAIPetApiRequest::uploadFileError(OAIApiResponse res, QNetworkReply::Networ } +void OAIPetApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ + +} + +void OAIPetApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ +} } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 1d1b0032b8b6..101226963e24 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -10,11 +10,12 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIPetApiRequest_H_ -#define _OAI_OAIPetApiRequest_H_ +#ifndef OAI_OAIPetApiRequest_H +#define OAI_OAIPetApiRequest_H #include #include +#include #include #include @@ -65,9 +66,16 @@ class OAIPetApiRequest : public QObject void uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str); - QMap getDefaultHeaders(); + void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); + + void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); + + QMap getDefaultHeaders() const; + QHttpEngine::Socket* getRawSocket(); + void setHeaders(QMultiMap headers); + signals: void addPet(OAIPet oai_pet); void deletePet(qint64 pet_id, QString api_key); @@ -87,4 +95,4 @@ class OAIPetApiRequest : public QObject } -#endif // _OAI_OAIPetApiRequest_H_ +#endif // OAI_OAIPetApiRequest_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp index 85a5f678d85a..e2193eb35a83 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp @@ -30,10 +30,15 @@ OAIStoreApiRequest::~OAIStoreApiRequest(){ } QMap -OAIStoreApiRequest::getDefaultHeaders(){ +OAIStoreApiRequest::getDefaultHeaders() const { return defaultHeaders; } +void OAIStoreApiRequest::setHeaders(QMultiMap headers){ + +} + + QHttpEngine::Socket* OAIStoreApiRequest::getRawSocket(){ return socket; } @@ -95,6 +100,7 @@ void OAIStoreApiRequest::placeOrderRequest(){ void OAIStoreApiRequest::deleteOrderResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -102,6 +108,7 @@ void OAIStoreApiRequest::deleteOrderResponse(){ } } void OAIStoreApiRequest::getInventoryResponse(QMap res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -109,6 +116,7 @@ void OAIStoreApiRequest::getInventoryResponse(QMap res){ } } void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -116,6 +124,7 @@ void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ } } void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -126,7 +135,8 @@ void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -135,7 +145,8 @@ void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type } void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -144,7 +155,8 @@ void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkRe } void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -153,7 +165,8 @@ void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkE } void OAIStoreApiRequest::placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -162,6 +175,12 @@ void OAIStoreApiRequest::placeOrderError(OAIOrder res, QNetworkReply::NetworkErr } +void OAIStoreApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ +} + +void OAIStoreApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ + +} } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h index 6157a9a07e55..3dab96371ce3 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h @@ -10,11 +10,12 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIStoreApiRequest_H_ -#define _OAI_OAIStoreApiRequest_H_ +#ifndef OAI_OAIStoreApiRequest_H +#define OAI_OAIStoreApiRequest_H #include #include +#include #include #include @@ -52,9 +53,16 @@ class OAIStoreApiRequest : public QObject void placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str); - QMap getDefaultHeaders(); + void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); + + void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); + + QMap getDefaultHeaders() const; + QHttpEngine::Socket* getRawSocket(); + void setHeaders(QMultiMap headers); + signals: void deleteOrder(QString order_id); void getInventory(); @@ -70,4 +78,4 @@ class OAIStoreApiRequest : public QObject } -#endif // _OAI_OAIStoreApiRequest_H_ +#endif // OAI_OAIStoreApiRequest_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp index 8e6b6c3a36cf..51e90cb0db00 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp @@ -30,10 +30,15 @@ OAIUserApiRequest::~OAIUserApiRequest(){ } QMap -OAIUserApiRequest::getDefaultHeaders(){ +OAIUserApiRequest::getDefaultHeaders() const { return defaultHeaders; } +void OAIUserApiRequest::setHeaders(QMultiMap headers){ + +} + + QHttpEngine::Socket* OAIUserApiRequest::getRawSocket(){ return socket; } @@ -179,6 +184,7 @@ void OAIUserApiRequest::updateUserRequest(QString usernamestr){ void OAIUserApiRequest::createUserResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -186,6 +192,7 @@ void OAIUserApiRequest::createUserResponse(){ } } void OAIUserApiRequest::createUsersWithArrayInputResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -193,6 +200,7 @@ void OAIUserApiRequest::createUsersWithArrayInputResponse(){ } } void OAIUserApiRequest::createUsersWithListInputResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -200,6 +208,7 @@ void OAIUserApiRequest::createUsersWithListInputResponse(){ } } void OAIUserApiRequest::deleteUserResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -207,6 +216,7 @@ void OAIUserApiRequest::deleteUserResponse(){ } } void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -214,6 +224,7 @@ void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ } } void OAIUserApiRequest::loginUserResponse(QString res){ + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -221,6 +232,7 @@ void OAIUserApiRequest::loginUserResponse(QString res){ } } void OAIUserApiRequest::logoutUserResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -228,6 +240,7 @@ void OAIUserApiRequest::logoutUserResponse(){ } } void OAIUserApiRequest::updateUserResponse(){ + socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->writeHeaders(); @@ -238,7 +251,8 @@ void OAIUserApiRequest::updateUserResponse(){ void OAIUserApiRequest::createUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -247,7 +261,8 @@ void OAIUserApiRequest::createUserError(QNetworkReply::NetworkError error_type, } void OAIUserApiRequest::createUsersWithArrayInputError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -256,7 +271,8 @@ void OAIUserApiRequest::createUsersWithArrayInputError(QNetworkReply::NetworkErr } void OAIUserApiRequest::createUsersWithListInputError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -265,7 +281,8 @@ void OAIUserApiRequest::createUsersWithListInputError(QNetworkReply::NetworkErro } void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -274,7 +291,8 @@ void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, } void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -283,7 +301,8 @@ void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkEr } void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + Q_UNUSED(res); socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -292,7 +311,8 @@ void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError } void OAIUserApiRequest::logoutUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -301,7 +321,8 @@ void OAIUserApiRequest::logoutUserError(QNetworkReply::NetworkError error_type, } void OAIUserApiRequest::updateUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); - Q_UNUSED(error_str); + Q_UNUSED(error_str); + socket->setStatusCode(QHttpEngine::Socket::NotFound); if(socket->isOpen()){ socket->writeHeaders(); @@ -310,6 +331,12 @@ void OAIUserApiRequest::updateUserError(QNetworkReply::NetworkError error_type, } +void OAIUserApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ +} + +void OAIUserApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ + +} } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h index 492b236286c5..be797957186b 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h @@ -10,11 +10,12 @@ * Do not edit the class manually. */ -#ifndef _OAI_OAIUserApiRequest_H_ -#define _OAI_OAIUserApiRequest_H_ +#ifndef OAI_OAIUserApiRequest_H +#define OAI_OAIUserApiRequest_H #include #include +#include #include #include @@ -64,9 +65,16 @@ class OAIUserApiRequest : public QObject void updateUserError(QNetworkReply::NetworkError error_type, QString& error_str); - QMap getDefaultHeaders(); + void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); + + void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); + + QMap getDefaultHeaders() const; + QHttpEngine::Socket* getRawSocket(); + void setHeaders(QMultiMap headers); + signals: void createUser(OAIUser oai_user); void createUsersWithArrayInput(QList oai_user); @@ -86,4 +94,4 @@ class OAIUserApiRequest : public QObject } -#endif // _OAI_OAIUserApiRequest_H_ +#endif // OAI_OAIUserApiRequest_H From 2b72cda1bf951545ba08f2a40b90bc52f88b8105 Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 10:11:47 +0200 Subject: [PATCH 02/10] Remove duplicate code from subclass and add missing setupRoutes --- .../CppQt5QHttpEngineServerCodegen.java | 40 +++---------------- .../main.cpp.mustache | 1 + 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index 07ca94e479c0..bfae9bddff46 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -34,7 +34,8 @@ import java.util.Set; public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5QHttpEngineServerCodegen.class); + @SuppressWarnings("unused") + private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5QHttpEngineServerCodegen.class); public static final String CPP_NAMESPACE = "cppNamespace"; public static final String CPP_NAMESPACE_DESC = "C++ namespace (convention: name::space::for::api)."; @@ -327,6 +328,7 @@ public String toApiFilename(String name) { * @return a string value used as the `dataType` field for model templates, `returnType` for api templates */ @Override + @SuppressWarnings("rawtypes") public String getTypeDeclaration(Schema p) { String openAPIType = getSchemaType(p); @@ -352,6 +354,7 @@ public String getTypeDeclaration(Schema p) { } @Override + @SuppressWarnings("rawtypes") public String toDefaultValue(Schema p) { if (ModelUtils.isBooleanSchema(p)) { return "false"; @@ -391,6 +394,7 @@ public String toDefaultValue(Schema p) { * @return a string value of the type or complex model for this property */ @Override + @SuppressWarnings("rawtypes") public String getSchemaType(Schema p) { String openAPIType = super.getSchemaType(p); @@ -409,24 +413,6 @@ public String getSchemaType(Schema p) { return toModelName(type); } - @Override - public String toModelName(String type) { - if (type == null) { - LOGGER.warn("Model name can't be null. Defaul to 'UnknownModel'."); - type = "UnknownModel"; - } - - if (typeMapping.keySet().contains(type) || - typeMapping.values().contains(type) || - importMapping.values().contains(type) || - defaultIncludes.contains(type) || - languageSpecificPrimitives.contains(type)) { - return type; - } else { - return modelNamePrefix + Character.toUpperCase(type.charAt(0)) + type.substring(1); - } - } - @Override public String toVarName(String name) { // sanitize name @@ -455,22 +441,6 @@ public String toParamName(String name) { return toVarName(name); } - @Override - public String toApiName(String type) { - return modelNamePrefix + Character.toUpperCase(type.charAt(0)) + type.substring(1) + "Api"; - } - - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - @Override public String getTypeDeclaration(String str) { return str; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache index f95bbcffec44..c030bcb47f3c 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache @@ -72,6 +72,7 @@ int main(int argc, char * argv[]) QSharedPointer<{{cppNamespace}}::RequestHandler> handler(new {{cppNamespace}}::RequestHandler()); {{cppNamespace}}::ApiRouter router; + router.setUpRoutes(); QObject::connect(handler.data(), &{{cppNamespace}}::RequestHandler::requestReceived, [&](QHttpEngine::Socket *socket) { router.processRequest(socket); }); From 9522038e473332b7bc4126e6c6f4f283c4664940 Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 10:17:31 +0200 Subject: [PATCH 03/10] Removed redundant override --- .../CppQt5QHttpEngineServerCodegen.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index bfae9bddff46..474267fec253 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -263,21 +263,7 @@ public String toModelImport(String name) { return "#include \"" + folder + name + ".h\""; } - - /** - * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping - * those terms here. This logic is only called if a variable matches the reserved words - * - * @return the escaped term - */ - @Override - public String escapeReservedWord(String name) { - if (this.reservedWordsMappings().containsKey(name)) { - return this.reservedWordsMappings().get(name); - } - return "_" + name; - } - + /** * Location to write model files. You can use the modelPackage() as defined when the class is * instantiated From 585fad5588db4a92c78a7074656914631ff975a3 Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 12:11:45 +0200 Subject: [PATCH 04/10] Add serialization of responses --- .../apirequest.cpp.mustache | 61 +++-- .../apirequest.h.mustache | 7 +- .../helpers-header.mustache | 6 +- .../server/src/main.cpp | 1 + .../server/src/models/OAIHelpers.h | 6 +- .../server/src/requests/OAIPetApiRequest.cpp | 218 +++++++++++++----- .../server/src/requests/OAIPetApiRequest.h | 7 +- .../src/requests/OAIStoreApiRequest.cpp | 124 +++++++--- .../server/src/requests/OAIStoreApiRequest.h | 7 +- .../server/src/requests/OAIUserApiRequest.cpp | 206 ++++++++++++----- .../server/src/requests/OAIUserApiRequest.h | 7 +- 11 files changed, 457 insertions(+), 193 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index 9d55f6ba0e06..cda938472064 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -13,6 +13,10 @@ namespace {{this}} { {{/cppNamespaceDeclarations}} {{classname}}Request::{{classname}}Request(QHttpEngine::Socket *s, {{classname}}Handler* hdl) : QObject(s), socket(s), handler(hdl) { + auto headers = s->headers(); + for(auto itr = headers.begin(); itr != headers.end(); itr++) { + requestHeaders.insert(QString(itr.key()), QString(itr.value())); + } } {{classname}}Request::~{{classname}}Request(){ @@ -21,12 +25,14 @@ namespace {{this}} { } QMap -{{classname}}Request::getDefaultHeaders() const { - return defaultHeaders; +{{classname}}Request::getRequestHeaders() const { + return requestHeaders; } -void {{classname}}Request::setHeaders(QMultiMap headers){ - +void {{classname}}Request::setResponseHeaders(const QMultiMap& headers){ + for(auto itr = headers.begin(); itr != headers.end(); ++itr) { + responseHeaders.insert(itr.key(), itr.value()); + } } @@ -69,10 +75,10 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/isListContainer}} {{^isListContainer}} {{^isMapContainer}} - {{#isPrimitive}} + {{#isPrimitiveType}} {{{dataType}}} {{paramName}}; ::{{cppNamespace}}::fromStringValue((QString(socket->readAll()), {{paramName}}); - {{/isPrimitive}} + {{/isPrimitiveType}} {{/isMapContainer}} {{#isMapContainer}} QJsonDocument doc; @@ -86,13 +92,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} } {{/isMapContainer}} {{^isMapContainer}} - {{^isPrimitive}} + {{^isPrimitiveType}} QJsonDocument doc; socket->readJson(doc); QJsonObject obj = doc.object(); {{{dataType}}} {{paramName}}; ::{{cppNamespace}}::fromJsonValue({{paramName}}, obj); - {{/isPrimitive}} + {{/isPrimitiveType}} {{/isMapContainer}} {{/isListContainer}} {{/bodyParam}}{{/bodyParams}} @@ -103,33 +109,50 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}{{{returnType}}} res{{/returnType}}){ - {{#returnType}}Q_UNUSED(res);{{/returnType}} - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders();{{#returnType}}{{^isPrimitiveType}} + QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} + socket->writeJson(resDoc);{{#isPrimitiveType}} + socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} + socket->setStatusCode(QHttpEngine::Socket::OK);{{/returnType}} if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } -{{/operation}}{{/operations}} +{{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - {{#returnType}}Q_UNUSED(res);{{/returnType}} + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders();{{#returnType}} + Q_UNUSED(error_str); // response will be used instead of error string{{^isPrimitiveType}} + QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} + socket->writeJson(resDoc);{{#isPrimitiveType}} + socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8());{{/returnType}} if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } -{{/operation}}{{/operations}} +{{/operation}}{{/operations}} void {{classname}}Request::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } void {{classname}}Request::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } {{#cppNamespaceDeclarations}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache index f8edceb28ff5..9f0ffa6d777e 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache @@ -38,18 +38,19 @@ public: void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); - QMap getDefaultHeaders() const; + QMap getRequestHeaders() const; QHttpEngine::Socket* getRawSocket(); - void setHeaders(QMultiMap headers); + void setResponseHeaders(const QMultiMap& headers); signals: {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{/operation}}{{/operations}} private: - QMap defaultHeaders; + QMap requestHeaders; + QMap responseHeaders; QHttpEngine::Socket *socket; {{classname}}Handler *handler; }; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache index 55d671f2e654..92f0b96c1799 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache @@ -1,6 +1,6 @@ {{>licenseInfo}} -#ifndef __{{prefix}}_HELPERS_H__ -#define __{{prefix}}_HELPERS_H__ +#ifndef {{prefix}}_HELPERS_H +#define {{prefix}}_HELPERS_H #include #include @@ -141,4 +141,4 @@ namespace {{this}} { } {{/cppNamespaceDeclarations}} -#endif // __{{prefix}}_HELPERS_H__ +#endif // {{prefix}}_HELPERS_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp index daa01fcf217d..db0590c4ed8a 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp @@ -83,6 +83,7 @@ int main(int argc, char * argv[]) QSharedPointer handler(new OpenAPI::RequestHandler()); OpenAPI::ApiRouter router; + router.setUpRoutes(); QObject::connect(handler.data(), &OpenAPI::RequestHandler::requestReceived, [&](QHttpEngine::Socket *socket) { router.processRequest(socket); }); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h index bf4e559aa36b..77722b829433 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h @@ -10,8 +10,8 @@ * Do not edit the class manually. */ -#ifndef __OAI_HELPERS_H__ -#define __OAI_HELPERS_H__ +#ifndef OAI_HELPERS_H +#define OAI_HELPERS_H #include #include @@ -148,4 +148,4 @@ namespace OpenAPI { } -#endif // __OAI_HELPERS_H__ +#endif // OAI_HELPERS_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp index 9bd90197be7c..fa1010e13243 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp @@ -22,6 +22,10 @@ namespace OpenAPI { OAIPetApiRequest::OAIPetApiRequest(QHttpEngine::Socket *s, OAIPetApiHandler* hdl) : QObject(s), socket(s), handler(hdl) { + auto headers = s->headers(); + for(auto itr = headers.begin(); itr != headers.end(); itr++) { + requestHeaders.insert(QString(itr.key()), QString(itr.value())); + } } OAIPetApiRequest::~OAIPetApiRequest(){ @@ -30,12 +34,14 @@ OAIPetApiRequest::~OAIPetApiRequest(){ } QMap -OAIPetApiRequest::getDefaultHeaders() const { - return defaultHeaders; +OAIPetApiRequest::getRequestHeaders() const { + return requestHeaders; } -void OAIPetApiRequest::setHeaders(QMultiMap headers){ - +void OAIPetApiRequest::setResponseHeaders(const QMultiMap& headers){ + for(auto itr = headers.begin(); itr != headers.end(); ++itr) { + responseHeaders.insert(itr.key(), itr.value()); + } } @@ -173,159 +179,247 @@ void OAIPetApiRequest::uploadFileRequest(QString pet_idstr){ void OAIPetApiRequest::addPetResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::deletePetResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::findPetsByStatusResponse(QList res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::findPetsByTagsResponse(QList res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::updatePetResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::updatePetWithFormResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIPetApiRequest::addPetError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::updatePetError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIPetApiRequest::uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIPetApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } void OAIPetApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 101226963e24..81ab423d0489 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -70,11 +70,11 @@ class OAIPetApiRequest : public QObject void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); - QMap getDefaultHeaders() const; + QMap getRequestHeaders() const; QHttpEngine::Socket* getRawSocket(); - void setHeaders(QMultiMap headers); + void setResponseHeaders(const QMultiMap& headers); signals: void addPet(OAIPet oai_pet); @@ -88,7 +88,8 @@ class OAIPetApiRequest : public QObject private: - QMap defaultHeaders; + QMap requestHeaders; + QMap responseHeaders; QHttpEngine::Socket *socket; OAIPetApiHandler *handler; }; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp index e2193eb35a83..fa403a4191c1 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp @@ -22,6 +22,10 @@ namespace OpenAPI { OAIStoreApiRequest::OAIStoreApiRequest(QHttpEngine::Socket *s, OAIStoreApiHandler* hdl) : QObject(s), socket(s), handler(hdl) { + auto headers = s->headers(); + for(auto itr = headers.begin(); itr != headers.end(); itr++) { + requestHeaders.insert(QString(itr.key()), QString(itr.value())); + } } OAIStoreApiRequest::~OAIStoreApiRequest(){ @@ -30,12 +34,14 @@ OAIStoreApiRequest::~OAIStoreApiRequest(){ } QMap -OAIStoreApiRequest::getDefaultHeaders() const { - return defaultHeaders; +OAIStoreApiRequest::getRequestHeaders() const { + return requestHeaders; } -void OAIStoreApiRequest::setHeaders(QMultiMap headers){ - +void OAIStoreApiRequest::setResponseHeaders(const QMultiMap& headers){ + for(auto itr = headers.begin(); itr != headers.end(); ++itr) { + responseHeaders.insert(itr.key(), itr.value()); + } } @@ -100,87 +106,133 @@ void OAIStoreApiRequest::placeOrderRequest(){ void OAIStoreApiRequest::deleteOrderResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::getInventoryResponse(QMap res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIStoreApiRequest::placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIStoreApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } void OAIStoreApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h index 3dab96371ce3..d88cebb3c76f 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h @@ -57,11 +57,11 @@ class OAIStoreApiRequest : public QObject void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); - QMap getDefaultHeaders() const; + QMap getRequestHeaders() const; QHttpEngine::Socket* getRawSocket(); - void setHeaders(QMultiMap headers); + void setResponseHeaders(const QMultiMap& headers); signals: void deleteOrder(QString order_id); @@ -71,7 +71,8 @@ class OAIStoreApiRequest : public QObject private: - QMap defaultHeaders; + QMap requestHeaders; + QMap responseHeaders; QHttpEngine::Socket *socket; OAIStoreApiHandler *handler; }; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp index 51e90cb0db00..6855495be75b 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp @@ -22,6 +22,10 @@ namespace OpenAPI { OAIUserApiRequest::OAIUserApiRequest(QHttpEngine::Socket *s, OAIUserApiHandler* hdl) : QObject(s), socket(s), handler(hdl) { + auto headers = s->headers(); + for(auto itr = headers.begin(); itr != headers.end(); itr++) { + requestHeaders.insert(QString(itr.key()), QString(itr.value())); + } } OAIUserApiRequest::~OAIUserApiRequest(){ @@ -30,12 +34,14 @@ OAIUserApiRequest::~OAIUserApiRequest(){ } QMap -OAIUserApiRequest::getDefaultHeaders() const { - return defaultHeaders; +OAIUserApiRequest::getRequestHeaders() const { + return requestHeaders; } -void OAIUserApiRequest::setHeaders(QMultiMap headers){ - +void OAIUserApiRequest::setResponseHeaders(const QMultiMap& headers){ + for(auto itr = headers.begin(); itr != headers.end(); ++itr) { + responseHeaders.insert(itr.key(), itr.value()); + } } @@ -184,159 +190,243 @@ void OAIUserApiRequest::updateUserRequest(QString usernamestr){ void OAIUserApiRequest::createUserResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::createUsersWithArrayInputResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::createUsersWithListInputResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::deleteUserResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::loginUserResponse(QString res){ - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::OK); + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::logoutUserResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::updateUserResponse(){ - + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIUserApiRequest::createUserError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::createUsersWithArrayInputError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::createUsersWithListInputError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - Q_UNUSED(res); - socket->setStatusCode(QHttpEngine::Socket::NotFound); + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + Q_UNUSED(error_str); // response will be used instead of error string + QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); + socket->writeJson(resDoc); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::logoutUserError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } + void OAIUserApiRequest::updateUserError(QNetworkReply::NetworkError error_type, QString& error_str){ - Q_UNUSED(error_type); - Q_UNUSED(error_str); - + Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); + socket->write(error_str.toUtf8()); if(socket->isOpen()){ - socket->writeHeaders(); socket->close(); } } void OAIUserApiRequest::sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } void OAIUserApiRequest::sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type){ - + Q_UNUSED(res); // TODO + Q_UNUSED(error_type); // TODO } } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h index be797957186b..47dc45905a06 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h @@ -69,11 +69,11 @@ class OAIUserApiRequest : public QObject void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type); - QMap getDefaultHeaders() const; + QMap getRequestHeaders() const; QHttpEngine::Socket* getRawSocket(); - void setHeaders(QMultiMap headers); + void setResponseHeaders(const QMultiMap& headers); signals: void createUser(OAIUser oai_user); @@ -87,7 +87,8 @@ class OAIUserApiRequest : public QObject private: - QMap defaultHeaders; + QMap requestHeaders; + QMap responseHeaders; QHttpEngine::Socket *socket; OAIUserApiHandler *handler; }; From 851e3158b8395632f21ba4429221be006658bd6e Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 12:30:38 +0200 Subject: [PATCH 05/10] Fix CI failure --- .../codegen/languages/CppQt5QHttpEngineServerCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index 474267fec253..9ca30263bf98 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -35,7 +35,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implements CodegenConfig { @SuppressWarnings("unused") - private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5QHttpEngineServerCodegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5QHttpEngineServerCodegen.class); public static final String CPP_NAMESPACE = "cppNamespace"; public static final String CPP_NAMESPACE_DESC = "C++ namespace (convention: name::space::for::api)."; From fd4f82d7fd844866d3b3c017a4302399607000cb Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 22:32:22 +0200 Subject: [PATCH 06/10] Add inline function to duplicate code. --- .../apirequest.cpp.mustache | 14 +-- .../apirequest.h.mustache | 9 ++ .../server/src/requests/OAIPetApiRequest.cpp | 112 +++--------------- .../server/src/requests/OAIPetApiRequest.h | 9 ++ .../src/requests/OAIStoreApiRequest.cpp | 56 ++------- .../server/src/requests/OAIStoreApiRequest.h | 9 ++ .../server/src/requests/OAIUserApiRequest.cpp | 112 +++--------------- .../server/src/requests/OAIUserApiRequest.h | 9 ++ 8 files changed, 78 insertions(+), 252 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index cda938472064..cfcfcafc845d 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -109,12 +109,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}{{{returnType}}} res{{/returnType}}){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders();{{#returnType}}{{^isPrimitiveType}} + writeResponseHeaders();{{#returnType}}{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} @@ -127,12 +122,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders();{{#returnType}} + writeResponseHeaders();{{#returnType}} Q_UNUSED(error_str); // response will be used instead of error string{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache index 9f0ffa6d777e..b8e6ea139380 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache @@ -53,6 +53,15 @@ private: QMap responseHeaders; QHttpEngine::Socket *socket; {{classname}}Handler *handler; + + inline void writeResponseHeaders(){ + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + } }; {{#cppNamespaceDeclarations}} diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp index fa1010e13243..a4c1617e06aa 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp @@ -179,12 +179,7 @@ void OAIPetApiRequest::uploadFileRequest(QString pet_idstr){ void OAIPetApiRequest::addPetResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -192,12 +187,7 @@ void OAIPetApiRequest::addPetResponse(){ } void OAIPetApiRequest::deletePetResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -205,12 +195,7 @@ void OAIPetApiRequest::deletePetResponse(){ } void OAIPetApiRequest::findPetsByStatusResponse(QList res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -219,12 +204,7 @@ void OAIPetApiRequest::findPetsByStatusResponse(QList res){ } void OAIPetApiRequest::findPetsByTagsResponse(QList res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -233,12 +213,7 @@ void OAIPetApiRequest::findPetsByTagsResponse(QList res){ } void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -247,12 +222,7 @@ void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ } void OAIPetApiRequest::updatePetResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -260,12 +230,7 @@ void OAIPetApiRequest::updatePetResponse(){ } void OAIPetApiRequest::updatePetWithFormResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -273,12 +238,7 @@ void OAIPetApiRequest::updatePetWithFormResponse(){ } void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -289,12 +249,7 @@ void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ void OAIPetApiRequest::addPetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -304,12 +259,7 @@ void OAIPetApiRequest::addPetError(QNetworkReply::NetworkError error_type, QStri void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -319,12 +269,7 @@ void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QS void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); @@ -335,12 +280,7 @@ void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::N void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); @@ -351,12 +291,7 @@ void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::Net void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -367,12 +302,7 @@ void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError e void OAIPetApiRequest::updatePetError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -382,12 +312,7 @@ void OAIPetApiRequest::updatePetError(QNetworkReply::NetworkError error_type, QS void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -397,12 +322,7 @@ void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_ void OAIPetApiRequest::uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 81ab423d0489..2c8e9dd422e8 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -92,6 +92,15 @@ class OAIPetApiRequest : public QObject QMap responseHeaders; QHttpEngine::Socket *socket; OAIPetApiHandler *handler; + + inline void writeResponseHeaders(){ + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + } }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp index fa403a4191c1..c14d076102a6 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp @@ -106,12 +106,7 @@ void OAIStoreApiRequest::placeOrderRequest(){ void OAIStoreApiRequest::deleteOrderResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -119,12 +114,7 @@ void OAIStoreApiRequest::deleteOrderResponse(){ } void OAIStoreApiRequest::getInventoryResponse(QMap res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -133,12 +123,7 @@ void OAIStoreApiRequest::getInventoryResponse(QMap res){ } void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -147,12 +132,7 @@ void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ } void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -163,12 +143,7 @@ void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -178,12 +153,7 @@ void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -194,12 +164,7 @@ void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkRe void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -210,12 +175,7 @@ void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkE void OAIStoreApiRequest::placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h index d88cebb3c76f..db8e89760bed 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h @@ -75,6 +75,15 @@ class OAIStoreApiRequest : public QObject QMap responseHeaders; QHttpEngine::Socket *socket; OAIStoreApiHandler *handler; + + inline void writeResponseHeaders(){ + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + } }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp index 6855495be75b..c36c80c8d9b5 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp @@ -190,12 +190,7 @@ void OAIUserApiRequest::updateUserRequest(QString usernamestr){ void OAIUserApiRequest::createUserResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -203,12 +198,7 @@ void OAIUserApiRequest::createUserResponse(){ } void OAIUserApiRequest::createUsersWithArrayInputResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -216,12 +206,7 @@ void OAIUserApiRequest::createUsersWithArrayInputResponse(){ } void OAIUserApiRequest::createUsersWithListInputResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -229,12 +214,7 @@ void OAIUserApiRequest::createUsersWithListInputResponse(){ } void OAIUserApiRequest::deleteUserResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -242,12 +222,7 @@ void OAIUserApiRequest::deleteUserResponse(){ } void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -256,12 +231,7 @@ void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ } void OAIUserApiRequest::loginUserResponse(QString res){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); if(socket->isOpen()){ @@ -270,12 +240,7 @@ void OAIUserApiRequest::loginUserResponse(QString res){ } void OAIUserApiRequest::logoutUserResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -283,12 +248,7 @@ void OAIUserApiRequest::logoutUserResponse(){ } void OAIUserApiRequest::updateUserResponse(){ - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::OK); if(socket->isOpen()){ socket->close(); @@ -298,12 +258,7 @@ void OAIUserApiRequest::updateUserResponse(){ void OAIUserApiRequest::createUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -313,12 +268,7 @@ void OAIUserApiRequest::createUserError(QNetworkReply::NetworkError error_type, void OAIUserApiRequest::createUsersWithArrayInputError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -328,12 +278,7 @@ void OAIUserApiRequest::createUsersWithArrayInputError(QNetworkReply::NetworkErr void OAIUserApiRequest::createUsersWithListInputError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -343,12 +288,7 @@ void OAIUserApiRequest::createUsersWithListInputError(QNetworkReply::NetworkErro void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -358,12 +298,7 @@ void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -374,12 +309,7 @@ void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkEr void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -390,12 +320,7 @@ void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError void OAIUserApiRequest::logoutUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ @@ -405,12 +330,7 @@ void OAIUserApiRequest::logoutUserError(QNetworkReply::NetworkError error_type, void OAIUserApiRequest::updateUserError(QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors - QHttpEngine::Socket::HeaderMap resHeaders; - for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { - resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); - } - socket->setHeaders(resHeaders); - socket->writeHeaders(); + writeResponseHeaders(); socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8()); if(socket->isOpen()){ diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h index 47dc45905a06..72543424150a 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h @@ -91,6 +91,15 @@ class OAIUserApiRequest : public QObject QMap responseHeaders; QHttpEngine::Socket *socket; OAIUserApiHandler *handler; + + inline void writeResponseHeaders(){ + QHttpEngine::Socket::HeaderMap resHeaders; + for(auto itr = responseHeaders.begin(); itr != responseHeaders.end(); ++itr) { + resHeaders.insert(itr.key().toUtf8(), itr.value().toUtf8()); + } + socket->setHeaders(resHeaders); + socket->writeHeaders(); + } }; } From 00ca699e56b0ebdb641edc2adf1705305aafc95b Mon Sep 17 00:00:00 2001 From: sunn Date: Sat, 28 Jul 2018 22:48:01 +0200 Subject: [PATCH 07/10] Make const reference wherever possible --- .../apirequest.cpp.mustache | 6 ++--- .../apirequest.h.mustache | 6 ++--- .../server/src/requests/OAIPetApiRequest.cpp | 24 +++++++++---------- .../server/src/requests/OAIPetApiRequest.h | 24 +++++++++---------- .../src/requests/OAIStoreApiRequest.cpp | 16 ++++++------- .../server/src/requests/OAIStoreApiRequest.h | 16 ++++++------- .../server/src/requests/OAIUserApiRequest.cpp | 14 +++++------ .../server/src/requests/OAIUserApiRequest.h | 14 +++++------ 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index cfcfcafc845d..cf2cac0dab70 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -41,7 +41,7 @@ QHttpEngine::Socket* {{classname}}Request::getRawSocket(){ } {{#operations}}{{#operation}} -void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}QString {{{paramName}}}str{{/pathParams}}{{/hasPathParams}}){ +void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}str{{/pathParams}}{{/hasPathParams}}){ qDebug() << "{{{basePathWithoutHost}}}{{{path}}}"; connect(this, &{{classname}}Request::{{nickname}}, handler, &{{classname}}Handler::{{nickname}}); @@ -108,7 +108,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} -{{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}{{{returnType}}} res{{/returnType}}){ +{{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}){ writeResponseHeaders();{{#returnType}}{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} @@ -120,7 +120,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} } {{/operation}}{{/operations}} -{{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ +{{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}const {{{returnType}}}& res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders();{{#returnType}} Q_UNUSED(error_str); // response will be used instead of error string{{^isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache index b8e6ea139380..a99562c2559c 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache @@ -25,13 +25,13 @@ public: {{classname}}Request(QHttpEngine::Socket *s, {{classname}}Handler* handler); virtual ~{{classname}}Request(); - {{#operations}}{{#operation}}void {{nickname}}Request({{#hasPathParams}}{{#pathParams}}QString {{{paramName}}}{{/pathParams}}{{/hasPathParams}}); + {{#operations}}{{#operation}}void {{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}{{/pathParams}}{{/hasPathParams}}); {{/operation}}{{/operations}} - {{#operations}}{{#operation}}void {{nickname}}Response({{#returnType}}{{{returnType}}} res{{/returnType}}); + {{#operations}}{{#operation}}void {{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}); {{/operation}}{{/operations}} - {{#operations}}{{#operation}}void {{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str); + {{#operations}}{{#operation}}void {{nickname}}Error({{#returnType}}const {{{returnType}}}& res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str); {{/operation}}{{/operations}} void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp index a4c1617e06aa..1a5953e78b1c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp @@ -67,7 +67,7 @@ void OAIPetApiRequest::addPetRequest(){ } -void OAIPetApiRequest::deletePetRequest(QString pet_idstr){ +void OAIPetApiRequest::deletePetRequest(const QString& pet_idstr){ qDebug() << "/v2/pet/{petId}"; connect(this, &OAIPetApiRequest::deletePet, handler, &OAIPetApiHandler::deletePet); @@ -117,7 +117,7 @@ void OAIPetApiRequest::findPetsByTagsRequest(){ } -void OAIPetApiRequest::getPetByIdRequest(QString pet_idstr){ +void OAIPetApiRequest::getPetByIdRequest(const QString& pet_idstr){ qDebug() << "/v2/pet/{petId}"; connect(this, &OAIPetApiRequest::getPetById, handler, &OAIPetApiHandler::getPetById); @@ -147,7 +147,7 @@ void OAIPetApiRequest::updatePetRequest(){ } -void OAIPetApiRequest::updatePetWithFormRequest(QString pet_idstr){ +void OAIPetApiRequest::updatePetWithFormRequest(const QString& pet_idstr){ qDebug() << "/v2/pet/{petId}"; connect(this, &OAIPetApiRequest::updatePetWithForm, handler, &OAIPetApiHandler::updatePetWithForm); @@ -162,7 +162,7 @@ void OAIPetApiRequest::updatePetWithFormRequest(QString pet_idstr){ } -void OAIPetApiRequest::uploadFileRequest(QString pet_idstr){ +void OAIPetApiRequest::uploadFileRequest(const QString& pet_idstr){ qDebug() << "/v2/pet/{petId}/uploadImage"; connect(this, &OAIPetApiRequest::uploadFile, handler, &OAIPetApiHandler::uploadFile); @@ -194,7 +194,7 @@ void OAIPetApiRequest::deletePetResponse(){ } } -void OAIPetApiRequest::findPetsByStatusResponse(QList res){ +void OAIPetApiRequest::findPetsByStatusResponse(const QList& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); @@ -203,7 +203,7 @@ void OAIPetApiRequest::findPetsByStatusResponse(QList res){ } } -void OAIPetApiRequest::findPetsByTagsResponse(QList res){ +void OAIPetApiRequest::findPetsByTagsResponse(const QList& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toArray()); socket->writeJson(resDoc); @@ -212,7 +212,7 @@ void OAIPetApiRequest::findPetsByTagsResponse(QList res){ } } -void OAIPetApiRequest::getPetByIdResponse(OAIPet res){ +void OAIPetApiRequest::getPetByIdResponse(const OAIPet& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -237,7 +237,7 @@ void OAIPetApiRequest::updatePetWithFormResponse(){ } } -void OAIPetApiRequest::uploadFileResponse(OAIApiResponse res){ +void OAIPetApiRequest::uploadFileResponse(const OAIApiResponse& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -267,7 +267,7 @@ void OAIPetApiRequest::deletePetError(QNetworkReply::NetworkError error_type, QS } } -void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIPetApiRequest::findPetsByStatusError(const QList& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -278,7 +278,7 @@ void OAIPetApiRequest::findPetsByStatusError(QList res, QNetworkReply::N } } -void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIPetApiRequest::findPetsByTagsError(const QList& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -289,7 +289,7 @@ void OAIPetApiRequest::findPetsByTagsError(QList res, QNetworkReply::Net } } -void OAIPetApiRequest::getPetByIdError(OAIPet res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIPetApiRequest::getPetByIdError(const OAIPet& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -320,7 +320,7 @@ void OAIPetApiRequest::updatePetWithFormError(QNetworkReply::NetworkError error_ } } -void OAIPetApiRequest::uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIPetApiRequest::uploadFileError(const OAIApiResponse& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 2c8e9dd422e8..aba7871567a2 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -37,33 +37,33 @@ class OAIPetApiRequest : public QObject virtual ~OAIPetApiRequest(); void addPetRequest(); - void deletePetRequest(QString pet_id); + void deletePetRequest(const QString& pet_id); void findPetsByStatusRequest(); void findPetsByTagsRequest(); - void getPetByIdRequest(QString pet_id); + void getPetByIdRequest(const QString& pet_id); void updatePetRequest(); - void updatePetWithFormRequest(QString pet_id); - void uploadFileRequest(QString pet_id); + void updatePetWithFormRequest(const QString& pet_id); + void uploadFileRequest(const QString& pet_id); void addPetResponse(); void deletePetResponse(); - void findPetsByStatusResponse(QList res); - void findPetsByTagsResponse(QList res); - void getPetByIdResponse(OAIPet res); + void findPetsByStatusResponse(const QList& res); + void findPetsByTagsResponse(const QList& res); + void getPetByIdResponse(const OAIPet& res); void updatePetResponse(); void updatePetWithFormResponse(); - void uploadFileResponse(OAIApiResponse res); + void uploadFileResponse(const OAIApiResponse& res); void addPetError(QNetworkReply::NetworkError error_type, QString& error_str); void deletePetError(QNetworkReply::NetworkError error_type, QString& error_str); - void findPetsByStatusError(QList res, QNetworkReply::NetworkError error_type, QString& error_str); - void findPetsByTagsError(QList res, QNetworkReply::NetworkError error_type, QString& error_str); - void getPetByIdError(OAIPet res, QNetworkReply::NetworkError error_type, QString& error_str); + void findPetsByStatusError(const QList& res, QNetworkReply::NetworkError error_type, QString& error_str); + void findPetsByTagsError(const QList& res, QNetworkReply::NetworkError error_type, QString& error_str); + void getPetByIdError(const OAIPet& res, QNetworkReply::NetworkError error_type, QString& error_str); void updatePetError(QNetworkReply::NetworkError error_type, QString& error_str); void updatePetWithFormError(QNetworkReply::NetworkError error_type, QString& error_str); - void uploadFileError(OAIApiResponse res, QNetworkReply::NetworkError error_type, QString& error_str); + void uploadFileError(const OAIApiResponse& res, QNetworkReply::NetworkError error_type, QString& error_str); void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp index c14d076102a6..a383601baa37 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp @@ -50,7 +50,7 @@ QHttpEngine::Socket* OAIStoreApiRequest::getRawSocket(){ } -void OAIStoreApiRequest::deleteOrderRequest(QString order_idstr){ +void OAIStoreApiRequest::deleteOrderRequest(const QString& order_idstr){ qDebug() << "/v2/store/order/{orderId}"; connect(this, &OAIStoreApiRequest::deleteOrder, handler, &OAIStoreApiHandler::deleteOrder); @@ -74,7 +74,7 @@ void OAIStoreApiRequest::getInventoryRequest(){ } -void OAIStoreApiRequest::getOrderByIdRequest(QString order_idstr){ +void OAIStoreApiRequest::getOrderByIdRequest(const QString& order_idstr){ qDebug() << "/v2/store/order/{orderId}"; connect(this, &OAIStoreApiRequest::getOrderById, handler, &OAIStoreApiHandler::getOrderById); @@ -113,7 +113,7 @@ void OAIStoreApiRequest::deleteOrderResponse(){ } } -void OAIStoreApiRequest::getInventoryResponse(QMap res){ +void OAIStoreApiRequest::getInventoryResponse(const QMap& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -122,7 +122,7 @@ void OAIStoreApiRequest::getInventoryResponse(QMap res){ } } -void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ +void OAIStoreApiRequest::getOrderByIdResponse(const OAIOrder& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -131,7 +131,7 @@ void OAIStoreApiRequest::getOrderByIdResponse(OAIOrder res){ } } -void OAIStoreApiRequest::placeOrderResponse(OAIOrder res){ +void OAIStoreApiRequest::placeOrderResponse(const OAIOrder& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -151,7 +151,7 @@ void OAIStoreApiRequest::deleteOrderError(QNetworkReply::NetworkError error_type } } -void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIStoreApiRequest::getInventoryError(const QMap& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -162,7 +162,7 @@ void OAIStoreApiRequest::getInventoryError(QMap res, QNetworkRe } } -void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIStoreApiRequest::getOrderByIdError(const OAIOrder& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -173,7 +173,7 @@ void OAIStoreApiRequest::getOrderByIdError(OAIOrder res, QNetworkReply::NetworkE } } -void OAIStoreApiRequest::placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIStoreApiRequest::placeOrderError(const OAIOrder& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h index db8e89760bed..b9c6ce1c041c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h @@ -35,22 +35,22 @@ class OAIStoreApiRequest : public QObject OAIStoreApiRequest(QHttpEngine::Socket *s, OAIStoreApiHandler* handler); virtual ~OAIStoreApiRequest(); - void deleteOrderRequest(QString order_id); + void deleteOrderRequest(const QString& order_id); void getInventoryRequest(); - void getOrderByIdRequest(QString order_id); + void getOrderByIdRequest(const QString& order_id); void placeOrderRequest(); void deleteOrderResponse(); - void getInventoryResponse(QMap res); - void getOrderByIdResponse(OAIOrder res); - void placeOrderResponse(OAIOrder res); + void getInventoryResponse(const QMap& res); + void getOrderByIdResponse(const OAIOrder& res); + void placeOrderResponse(const OAIOrder& res); void deleteOrderError(QNetworkReply::NetworkError error_type, QString& error_str); - void getInventoryError(QMap res, QNetworkReply::NetworkError error_type, QString& error_str); - void getOrderByIdError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str); - void placeOrderError(OAIOrder res, QNetworkReply::NetworkError error_type, QString& error_str); + void getInventoryError(const QMap& res, QNetworkReply::NetworkError error_type, QString& error_str); + void getOrderByIdError(const OAIOrder& res, QNetworkReply::NetworkError error_type, QString& error_str); + void placeOrderError(const OAIOrder& res, QNetworkReply::NetworkError error_type, QString& error_str); void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp index c36c80c8d9b5..bdc5b0b68828 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp @@ -111,7 +111,7 @@ void OAIUserApiRequest::createUsersWithListInputRequest(){ } -void OAIUserApiRequest::deleteUserRequest(QString usernamestr){ +void OAIUserApiRequest::deleteUserRequest(const QString& usernamestr){ qDebug() << "/v2/user/{username}"; connect(this, &OAIUserApiRequest::deleteUser, handler, &OAIUserApiHandler::deleteUser); @@ -124,7 +124,7 @@ void OAIUserApiRequest::deleteUserRequest(QString usernamestr){ } -void OAIUserApiRequest::getUserByNameRequest(QString usernamestr){ +void OAIUserApiRequest::getUserByNameRequest(const QString& usernamestr){ qDebug() << "/v2/user/{username}"; connect(this, &OAIUserApiRequest::getUserByName, handler, &OAIUserApiHandler::getUserByName); @@ -169,7 +169,7 @@ void OAIUserApiRequest::logoutUserRequest(){ } -void OAIUserApiRequest::updateUserRequest(QString usernamestr){ +void OAIUserApiRequest::updateUserRequest(const QString& usernamestr){ qDebug() << "/v2/user/{username}"; connect(this, &OAIUserApiRequest::updateUser, handler, &OAIUserApiHandler::updateUser); @@ -221,7 +221,7 @@ void OAIUserApiRequest::deleteUserResponse(){ } } -void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ +void OAIUserApiRequest::getUserByNameResponse(const OAIUser& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -230,7 +230,7 @@ void OAIUserApiRequest::getUserByNameResponse(OAIUser res){ } } -void OAIUserApiRequest::loginUserResponse(QString res){ +void OAIUserApiRequest::loginUserResponse(const QString& res){ writeResponseHeaders(); QJsonDocument resDoc(::OpenAPI::toJsonValue(res).toObject()); socket->writeJson(resDoc); @@ -296,7 +296,7 @@ void OAIUserApiRequest::deleteUserError(QNetworkReply::NetworkError error_type, } } -void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIUserApiRequest::getUserByNameError(const OAIUser& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string @@ -307,7 +307,7 @@ void OAIUserApiRequest::getUserByNameError(OAIUser res, QNetworkReply::NetworkEr } } -void OAIUserApiRequest::loginUserError(QString res, QNetworkReply::NetworkError error_type, QString& error_str){ +void OAIUserApiRequest::loginUserError(const QString& res, QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors writeResponseHeaders(); Q_UNUSED(error_str); // response will be used instead of error string diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h index 72543424150a..d1b30ef196dd 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h @@ -38,19 +38,19 @@ class OAIUserApiRequest : public QObject void createUserRequest(); void createUsersWithArrayInputRequest(); void createUsersWithListInputRequest(); - void deleteUserRequest(QString username); - void getUserByNameRequest(QString username); + void deleteUserRequest(const QString& username); + void getUserByNameRequest(const QString& username); void loginUserRequest(); void logoutUserRequest(); - void updateUserRequest(QString username); + void updateUserRequest(const QString& username); void createUserResponse(); void createUsersWithArrayInputResponse(); void createUsersWithListInputResponse(); void deleteUserResponse(); - void getUserByNameResponse(OAIUser res); - void loginUserResponse(QString res); + void getUserByNameResponse(const OAIUser& res); + void loginUserResponse(const QString& res); void logoutUserResponse(); void updateUserResponse(); @@ -59,8 +59,8 @@ class OAIUserApiRequest : public QObject void createUsersWithArrayInputError(QNetworkReply::NetworkError error_type, QString& error_str); void createUsersWithListInputError(QNetworkReply::NetworkError error_type, QString& error_str); void deleteUserError(QNetworkReply::NetworkError error_type, QString& error_str); - void getUserByNameError(OAIUser res, QNetworkReply::NetworkError error_type, QString& error_str); - void loginUserError(QString res, QNetworkReply::NetworkError error_type, QString& error_str); + void getUserByNameError(const OAIUser& res, QNetworkReply::NetworkError error_type, QString& error_str); + void loginUserError(const QString& res, QNetworkReply::NetworkError error_type, QString& error_str); void logoutUserError(QNetworkReply::NetworkError error_type, QString& error_str); void updateUserError(QNetworkReply::NetworkError error_type, QString& error_str); From a7d56c6b7971738d7fa3fda776aba1fcecd34ab5 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Mon, 30 Jul 2018 05:39:58 -0400 Subject: [PATCH 08/10] Add support for Array of Primitive types. --- .../apirequest.cpp.mustache | 2 +- .../helpers-header.mustache | 18 ++++++------------ .../server/src/models/OAIHelpers.h | 18 ++++++------------ 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index cf2cac0dab70..5315f10e2034 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -112,7 +112,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} writeResponseHeaders();{{#returnType}}{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} - socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} + socket->write(::{{cppNamespace}}{{#isListContainer}}QString("["+{{/isListContainer}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::OK);{{/returnType}} if(socket->isOpen()){ socket->close(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache index 92f0b96c1799..167676df65b8 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache @@ -28,21 +28,15 @@ namespace {{this}} { QString toStringValue(const double &value); template - QList toStringValue(const QList &val) { - QList strArray; + QString toStringValue(const QList &val) { + QString strArray; for(auto item : val) { - strArray.append(toStringValue(item)); + strArray.append(toStringValue(item) + ","); } - return strArray; - } - - template - QMap toStringValue(const QMap &val) { - QMap strMap; - for(auto itemkey : val.keys()) { - strMap.insert(itemkey, toStringValue(val.value(itemkey))); + if(val.count() > 0) { + strArray.chop(1); } - return strMap; + return strArray; } QJsonValue toJsonValue(const QString &value); diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h index 77722b829433..0172e9537788 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h @@ -37,21 +37,15 @@ namespace OpenAPI { QString toStringValue(const double &value); template - QList toStringValue(const QList &val) { - QList strArray; + QString toStringValue(const QList &val) { + QString strArray; for(auto item : val) { - strArray.append(toStringValue(item)); + strArray.append(toStringValue(item) + ","); } - return strArray; - } - - template - QMap toStringValue(const QMap &val) { - QMap strMap; - for(auto itemkey : val.keys()) { - strMap.insert(itemkey, toStringValue(val.value(itemkey))); + if(val.count() > 0) { + strArray.chop(1); } - return strMap; + return strArray; } QJsonValue toJsonValue(const QString &value); From 8fdeeb3f80d12d9ef27e5a1f7a39fc6b965d2559 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Mon, 30 Jul 2018 05:49:51 -0400 Subject: [PATCH 09/10] Add Array of Primitive support for Error response --- .../cpp-qt5-qhttpengine-server/apirequest.cpp.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index 5315f10e2034..599b077b3cdb 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -112,7 +112,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} writeResponseHeaders();{{#returnType}}{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} - socket->write(::{{cppNamespace}}{{#isListContainer}}QString("["+{{/isListContainer}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} + socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::OK);{{/returnType}} if(socket->isOpen()){ socket->close(); @@ -126,7 +126,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} Q_UNUSED(error_str); // response will be used instead of error string{{^isPrimitiveType}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());{{/isPrimitiveType}} socket->writeJson(resDoc);{{#isPrimitiveType}} - socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} + socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/isPrimitiveType}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8());{{/returnType}} if(socket->isOpen()){ From ebf138e474030d0ba3b038525a034ec5192daf99 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Mon, 30 Jul 2018 06:09:23 -0400 Subject: [PATCH 10/10] Update for multiple path params --- .../cpp-qt5-qhttpengine-server/apirequest.cpp.mustache | 2 +- .../resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache | 2 +- .../resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index 599b077b3cdb..4fa84629c381 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -41,7 +41,7 @@ QHttpEngine::Socket* {{classname}}Request::getRawSocket(){ } {{#operations}}{{#operation}} -void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}str{{/pathParams}}{{/hasPathParams}}){ +void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}str{{#hasMore}}, {{/hasMore}}{{/pathParams}}{{/hasPathParams}}){ qDebug() << "{{{basePathWithoutHost}}}{{{path}}}"; connect(this, &{{classname}}Request::{{nickname}}, handler, &{{classname}}Handler::{{nickname}}); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache index a99562c2559c..ed7339278adb 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache @@ -25,7 +25,7 @@ public: {{classname}}Request(QHttpEngine::Socket *s, {{classname}}Handler* handler); virtual ~{{classname}}Request(); - {{#operations}}{{#operation}}void {{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}{{/pathParams}}{{/hasPathParams}}); + {{#operations}}{{#operation}}void {{nickname}}Request({{#hasPathParams}}{{#pathParams}}const QString& {{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}{{/hasPathParams}}); {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache index 06fd17220e0e..be6c0bb0724b 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache @@ -75,7 +75,7 @@ void ApiRouter::processRequest(QHttpEngine::Socket *socket){ if ((toQHttpEngineMethod("{{httpMethod}}") == socket->method()) && match.hasMatch() ) { QString pathparam = match.captured(1); auto reqObj = new {{classname}}Request(socket, {{classname}}ApiHandler); - reqObj->{{nickname}}Request({{#hasPathParams}}{{#pathParams}}pathparam{{/pathParams}}{{/hasPathParams}});; + reqObj->{{nickname}}Request({{#hasPathParams}}{{#pathParams}}pathparam{{/pathParams}}{{/hasPathParams}}); return; } }{{/pathParams}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}