[C++] [Qt5] Set default base path and change constructor to const ref

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java

@@ -19,17 +19,21 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
+
+import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.templating.mustache.IndentedLambda;
+import org.openapitools.codegen.utils.URLPathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -300,4 +304,17 @@ public void postProcessFile(File file, String fileType) {
             }
         }
     }
+
+    @Override
+    public void preprocessOpenAPI(OpenAPI openAPI) {
+        URL url = URLPathUtils.getServerURL(openAPI);
+        String port = URLPathUtils.getPort(url, "");
+        String host = url.getHost();
+        if(!port.isEmpty()) {
+            this.additionalProperties.put("serverPort", port);          
+        }
+        if(!host.isEmpty()) {
+            this.additionalProperties.put("serverHost", host);          
+        }        
+    }
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java

@@ -404,14 +404,7 @@ public String getSchemaType(Schema p) {
     public String getTypeDeclaration(String str) {
         return toModelName(str);
     }
-
-    @Override
-    public void preprocessOpenAPI(OpenAPI openAPI) {
-        URL url = URLPathUtils.getServerURL(openAPI);
-        String port = URLPathUtils.getPort(url, "8080");
-        this.additionalProperties.put("serverPort", port);
-    }
-
+
     /**
      * Specify whether external libraries will be added during the generation 
      * @param value the value to be set

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java

@@ -194,13 +194,6 @@ public String apiFilename(String templateName, String tag) {
         return result;
     }
 
-    @Override
-    public void preprocessOpenAPI(OpenAPI openAPI) {
-        URL url = URLPathUtils.getServerURL(openAPI);
-        String port = URLPathUtils.getPort(url, "8080");
-        this.additionalProperties.put("serverPort", port);
-    }
-
     @Override
     public String toApiFilename(String name) {
         return modelNamePrefix + sanitizeName(camelize(name)) + "ApiHandler";

modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache

@@ -53,7 +53,7 @@ int main() {
     std::vector<int> sigs{SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     setUpUnixSignals(sigs);
 #endif
-    Pistache::Address addr(Pistache::Ipv4::any(), Pistache::Port({{serverPort}}));
+    Pistache::Address addr(Pistache::Ipv4::any(), Pistache::Port({{#serverPort}}{{serverPort}}{{/serverPort}}{{^serverPort}}8080{{/serverPort}}));
 
     httpEndpoint = new Pistache::Http::Endpoint((addr));
     auto router = std::make_shared<Pistache::Rest::Router>();

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

@@ -9,19 +9,33 @@
 namespace {{this}} {
 {{/cppNamespaceDeclarations}}
 
-{{classname}}::{{classname}}() {
+{{classname}}::{{classname}}() : basePath("{{{basePathWithoutHost}}}"),
+    host("{{#serverHost}}{{#scheme}}{{scheme}}://{{/scheme}}{{serverHost}}{{#serverPort}}:{{serverPort}}{{/serverPort}}{{/serverHost}}") {
 
 }
 
 {{classname}}::~{{classname}}() {
 
 }
 
-{{classname}}::{{classname}}(QString host, QString basePath) {
+{{classname}}::{{classname}}(const QString& host, const QString& basePath) {
     this->host = host;
     this->basePath = basePath;
 }
 
+void {{classname}}::setBasePath(const QString& basePath){
+    this->basePath = basePath;
+}
+
+void {{classname}}::setHost(const QString& host){
+    this->host = host;
+}
+
+void {{classname}}::addHeaders(const QString& key, const QString& value){
+    defaultHeaders.insert(key, value);
+}
+
+
 {{#operations}}
 {{#operation}}
 void

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

@@ -18,16 +18,19 @@ class {{classname}}: public QObject {
 
 public:
     {{classname}}();
-    {{classname}}(QString host, QString basePath);
+    {{classname}}(const QString& host, const QString& basePath);
     ~{{classname}}();
 
-    QString host;
-    QString basePath;
-    QMap<QString, QString> defaultHeaders;
-
+    void setBasePath(const QString& basePath);
+    void setHost(const QString& host);
+    void addHeaders(const QString& key, const QString& value);
+    
     {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}const {{{dataType}}}& {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     {{/operation}}{{/operations}}
 private:
+    QString basePath;
+    QString host;
+    QMap<QString, QString> defaultHeaders;
     {{#operations}}{{#operation}}void {{nickname}}Callback ({{prefix}}HttpRequestWorker * worker);
     {{/operation}}{{/operations}}
 signals:

modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache

@@ -58,7 +58,7 @@ int main(int argc, char * argv[])
         QStringList() << "p" << "port",
         "port to listen on",
         "port",
-        "{{serverPort}}"
+        "{{#serverPort}}{{serverPort}}{{/serverPort}}{{^serverPort}}8080{{/serverPort}}"
     );
     parser.addOption(portOption);
     parser.addHelpOption();

samples/client/petstore/cpp-qt5/.openapi-generator/VERSION

@@ -1 +1 @@
-3.0.1-SNAPSHOT
+4.0.1-SNAPSHOT

samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp

@@ -13,8 +13,7 @@ PetApiTests::~PetApiTests () {
 
 OAIPetApi* PetApiTests::getApi() {
     auto api = new OAIPetApi();
-    api->host = "http://petstore.swagger.io";
-    api->basePath = "/v2";
+    api->setHost("http://petstore.swagger.io");
     return api;
 }
 

samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp

@@ -13,8 +13,7 @@ StoreApiTests::~StoreApiTests () {
 
 OAIStoreApi* StoreApiTests::getApi() {
     auto api = new OAIStoreApi();
-    api->host = "http://petstore.swagger.io";
-    api->basePath = "/v2";
+    api->setHost("http://petstore.swagger.io");
     return api;
 }
 
@@ -43,6 +42,7 @@ void StoreApiTests::placeOrderTest() {
     };
     connect(this, &StoreApiTests::quit, finalizer);
     connect(api, &OAIStoreApi::placeOrderSignal, this, validator);
+    connect(api, &OAIStoreApi::placeOrderSignalE, this, finalizer);
     connect(&timer, &QTimer::timeout, &loop, finalizer);
 
     OAIOrder order;

samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp

@@ -13,8 +13,7 @@ UserApiTests::~UserApiTests () {
 
 OAIUserApi* UserApiTests::getApi() {
     auto api = new OAIUserApi();
-    api->host = "http://petstore.swagger.io";
-    api->basePath = "/v2";
+    api->setHost("http://petstore.swagger.io");
     return api;
 }
 

samples/client/petstore/cpp-qt5/client/OAIApiResponse.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIApiResponse.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAICategory.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAICategory.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIEnum.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIHelpers.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIObject.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIOrder.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIOrder.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIPet.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIPet.h

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -18,19 +18,33 @@
 
 namespace OpenAPI {
 
-OAIPetApi::OAIPetApi() {
+OAIPetApi::OAIPetApi() : basePath("/v2"),
+    host("petstore.swagger.io") {
 
 }
 
 OAIPetApi::~OAIPetApi() {
 
 }
 
-OAIPetApi::OAIPetApi(QString host, QString basePath) {
+OAIPetApi::OAIPetApi(const QString& host, const QString& basePath) {
     this->host = host;
     this->basePath = basePath;
 }
 
+void OAIPetApi::setBasePath(const QString& basePath){
+    this->basePath = basePath;
+}
+
+void OAIPetApi::setHost(const QString& host){
+    this->host = host;
+}
+
+void OAIPetApi::addHeaders(const QString& key, const QString& value){
+    defaultHeaders.insert(key, value);
+}
+
+
 void
 OAIPetApi::addPet(const OAIPet& body) {
     QString fullPath;
@@ -91,7 +105,7 @@ OAIPetApi::deletePet(const qint64& pet_id, const QString& api_key) {
     OAIHttpRequestInput input(fullPath, "DELETE");
 
     if (api_key != nullptr) {
-        input.headers.insert("api_key", "api_key");
+        input.headers.insert("api_key", api_key);
     }
 
     foreach(QString key, this->defaultHeaders.keys()) {