From adf3787db40ff8416cb19810bf973572778d9c64 Mon Sep 17 00:00:00 2001 From: Ilario Pittau Date: Wed, 22 Dec 2021 15:41:31 +0100 Subject: [PATCH 1/3] Fix extra m that prevents qt cpp server to build (#11176) --- .../resources/cpp-qt-qhttpengine-server/apirouter.h.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache index 028a3097e256..2677ec644dcc 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache @@ -36,7 +36,7 @@ protected: if (socket->bytesAvailable() >= socket->contentLength()) { emit requestReceived(socket); } else { - connect(socket, &Socket::readChannelFinished, [this, socket, m]() { + connect(socket, &Socket::readChannelFinished, [this, socket]() { emit requestReceived(socket); }); } @@ -105,4 +105,4 @@ private : } {{/cppNamespaceDeclarations}} -#endif // {{prefix}}_APIROUTER_H \ No newline at end of file +#endif // {{prefix}}_APIROUTER_H From 90d237981c1487ca602b13eca28675aeab0db3b0 Mon Sep 17 00:00:00 2001 From: Ilario Pittau Date: Wed, 22 Dec 2021 15:42:10 +0100 Subject: [PATCH 2/3] Fix regular expression to capture IDs on path (#11176) --- .../resources/cpp-qt-qhttpengine-server/apirouter.h.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache index 2677ec644dcc..bc66e7dd84b1 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache @@ -91,7 +91,7 @@ private : } inline QRegularExpressionMatch getRequestMatch(QString serverTemplatePath, QString requestPath){ - QRegularExpression parExpr( R"(\{([^\/\\s]+)\})" ); + QRegularExpression parExpr( R"(\{([^\/\s]+)\})" ); serverTemplatePath.replace( parExpr, R"((?<\1>[^\/\s]+))" ); serverTemplatePath.append("[\\/]?$"); QRegularExpression pathExpr( serverTemplatePath ); From e6487e29d7c316b2a4f8f6d116492ef5f578f85f Mon Sep 17 00:00:00 2001 From: Ilario Pittau Date: Wed, 22 Dec 2021 15:48:03 +0100 Subject: [PATCH 3/3] Fix build issue missing QHttpEngine namespace (#10706) --- .../resources/cpp-qt-qhttpengine-server/apirouter.h.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache index bc66e7dd84b1..f30a069c19b1 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/apirouter.h.mustache @@ -36,7 +36,7 @@ protected: if (socket->bytesAvailable() >= socket->contentLength()) { emit requestReceived(socket); } else { - connect(socket, &Socket::readChannelFinished, [this, socket]() { + connect(socket, &QHttpEngine::Socket::readChannelFinished, [this, socket]() { emit requestReceived(socket); }); }