[qt5 server] Improvement in response handling

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).";
@@ -234,7 +235,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
@@ -262,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
@@ -327,6 +314,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 +340,7 @@ public String getTypeDeclaration(Schema p) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")    
     public String toDefaultValue(Schema p) {
         if (ModelUtils.isBooleanSchema(p)) {
             return "false";
@@ -391,6 +380,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 +399,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 +427,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;

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 <QObject>
 
@@ -30,4 +30,4 @@ public slots:
 }
 {{/cppNamespaceDeclarations}}
 
-#endif // _{{prefix}}_{{classname}}Handler_H_
+#endif // {{prefix}}_{{classname}}Handler_H

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,10 +25,17 @@ namespace {{this}} {
 }
 
 QMap<QString, QString> 
-{{classname}}Request::getDefaultHeaders(){
-    return defaultHeaders;
+{{classname}}Request::getRequestHeaders() const {
+    return requestHeaders;
 }
 
+void {{classname}}Request::setResponseHeaders(const QMultiMap<QString, QString>& headers){
+    for(auto itr = headers.begin(); itr != headers.end(); ++itr) {
+        responseHeaders.insert(itr.key(), itr.value());
+    }
+}
+
+
 QHttpEngine::Socket* {{classname}}Request::getRawSocket(){
     return socket;
 }
@@ -64,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;
@@ -81,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}}
@@ -98,26 +109,51 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
 {{/operation}}{{/operations}}  
 
 {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}{{{returnType}}} 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);     
+    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}}
 }

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 <QObject>
 #include <QStringList>
+#include <QMultiMap>
 #include <QNetworkReply>
 #include <QSharedPointer>
 
@@ -33,15 +34,23 @@ public:
     {{#operations}}{{#operation}}void {{nickname}}Error({{#returnType}}{{{returnType}}} res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str);
     {{/operation}}{{/operations}}
 
-    QMap<QString, QString> getDefaultHeaders();
+    void sendCustomResponse(QByteArray & res, QNetworkReply::NetworkError error_type);
+
+    void sendCustomResponse(QIODevice *res, QNetworkReply::NetworkError error_type);
+
+    QMap<QString, QString> getRequestHeaders() const;
+
     QHttpEngine::Socket* getRawSocket();
 
+    void setResponseHeaders(const QMultiMap<QString,QString>& headers);
+
 signals:
     {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     {{/operation}}{{/operations}}
 
 private:
-    QMap<QString, QString> defaultHeaders;
+    QMap<QString, QString> requestHeaders;
+    QMap<QString, QString> responseHeaders;
     QHttpEngine::Socket  *socket;
     {{classname}}Handler *handler;
 };
@@ -50,4 +59,4 @@ private:
 }
 {{/cppNamespaceDeclarations}}
 
-#endif // _{{prefix}}_{{classname}}Request_H_
+#endif // {{prefix}}_{{classname}}Request_H

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}}        

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);
     });

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

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 <QJsonObject>
 
@@ -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}}

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
     {          

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 <QObject>
 
@@ -46,4 +46,4 @@ public slots:
 
 }
 
-#endif // _OAI_OAIPetApiHandler_H_
+#endif // OAI_OAIPetApiHandler_H

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 <QObject>
 
@@ -41,4 +41,4 @@ public slots:
 
 }
 
-#endif // _OAI_OAIStoreApiHandler_H_
+#endif // OAI_OAIStoreApiHandler_H