cpp-qt5-client: remove host since it is not well handled (#4429)

* fixup! Simpler timeout with QTimer::singleShot (#4430) * cpp-qt5-client: remove host since it is not well handled * Move disconnect again * cpp-qt5-client: handle scheme/host/port properly * Fix port change try
OpenAPITools · Nov 12, 2019 · 21a291f · 21a291f
1 parent 9ceabc7
commit 21a291f
Show file tree

Hide file tree

Showing 15 changed files with 277 additions and 205 deletions.
diff --git a/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -300,12 +300,17 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides());
         String port = URLPathUtils.getPort(url, "");
         String host = url.getHost();
+        String scheme = url.getProtocol();
+
         if(!port.isEmpty()) {
             this.additionalProperties.put("serverPort", port);
         }
         if(!host.isEmpty()) {
             this.additionalProperties.put("serverHost", host);
         }
+        if(!scheme.isEmpty()) {
+            this.additionalProperties.put("scheme", scheme);
+        }
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
@@ -9,49 +9,55 @@
 namespace {{this}} {
 {{/cppNamespaceDeclarations}}
 
-{{classname}}::{{classname}}() : basePath("{{{basePathWithoutHost}}}"),
-    host("{{#serverHost}}{{#scheme}}{{scheme}}://{{/scheme}}{{serverHost}}{{#serverPort}}:{{serverPort}}{{/serverPort}}{{/serverHost}}"),
-    timeout(0){
-
+{{classname}}::{{classname}}(const QString &scheme, const QString &host, int port, const QString& basePath, const int timeOut) :
+    _scheme(scheme),
+    _host(host),
+    _port(port),
+    _basePath(basePath),
+    _timeOut(timeOut) {
 }
 
 {{classname}}::~{{classname}}() {
+}
 
+void {{classname}}::setScheme(const QString& scheme){
+    _scheme = scheme;
 }
 
-{{classname}}::{{classname}}(const QString& host, const QString& basePath, const int tout) {
-    this->host = host;
-    this->basePath = basePath;
-    this->timeout = tout;
+void {{classname}}::setHost(const QString& host){
+    _host = host;
 }
 
-void {{classname}}::setBasePath(const QString& basePath){
-    this->basePath = basePath;
+void {{classname}}::setPort(int port){
+    _port = port;
 }
 
-void {{classname}}::setHost(const QString& host){
-    this->host = host;
+void {{classname}}::setBasePath(const QString& basePath){
+    _basePath = basePath;
 }
 
-void {{classname}}::setApiTimeOutMs(const int tout){
-    timeout = tout;
+void {{classname}}::setTimeOut(const int timeOut){
+    _timeOut = timeOut;
 }
 
 void {{classname}}::setWorkingDirectory(const QString& path){
-    workingDirectory = path;
+    _workingDirectory = path;
 }
 
 void {{classname}}::addHeaders(const QString& key, const QString& value){
     defaultHeaders.insert(key, value);
 }
 
-
 {{#operations}}
 {{#operation}}
 void
 {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}}& {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("{{{path}}}");
+    QString fullPath = QString("%0://%1%2%3%4")
+        .arg(_scheme)
+        .arg(_host)
+        .arg(_port ? ":" + QString::number(_port) : "")
+        .arg(_basePath)
+        .arg("{{{path}}}");
     {{#pathParams}}
     QString {{paramName}}PathParam("{");
     {{paramName}}PathParam.append("{{baseName}}").append("}");
@@ -107,8 +113,8 @@ void
     }
     {{/collectionFormat}}{{/queryParams}}
     {{prefix}}HttpRequestWorker *worker = new {{prefix}}HttpRequestWorker(this);
-    worker->setTimeOut(timeout);
-    worker->setWorkingDirectory(workingDirectory);    
+    worker->setTimeOut(_timeOut);
+    worker->setWorkingDirectory(_workingDirectory);
     {{prefix}}HttpRequestInput input(fullPath, "{{httpMethod}}");
     {{#formParams}}{{^isFile}}
     input.add_var("{{baseName}}", ::{{cppNamespace}}::toStringValue({{paramName}}));{{/isFile}}{{#isFile}}

diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
@@ -17,23 +17,23 @@ class {{classname}}: public QObject {
     Q_OBJECT
 
 public:
-    {{classname}}();
-    {{classname}}(const QString& host, const QString& basePath, const int toutMs = 0);
+    {{classname}}(const QString &scheme = "{{scheme}}", const QString &host = "{{serverHost}}", int port = {{#serverPort}}{{serverPort}}{{/serverPort}}{{^serverPort}}0{{/serverPort}}, const QString& basePath = "{{basePathWithoutHost}}", const int timeOut = 0);
     ~{{classname}}();
 
+    void setScheme(const QString &scheme);
+    void setHost(const QString &host);
+    void setPort(int port);
     void setBasePath(const QString& basePath);
-    void setHost(const QString& host);
-    void setApiTimeOutMs(const int tout);
+    void setTimeOut(const int timeOut);
     void setWorkingDirectory(const QString& path);
     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;
-    QString workingDirectory;
-    int timeout;
+    QString _scheme, _host, _basePath;
+    int _port, _timeOut;
+    QString _workingDirectory;
     QMap<QString, QString> defaultHeaders;
     {{#operations}}{{#operation}}void {{nickname}}Callback ({{prefix}}HttpRequestWorker * worker);
     {{/operation}}{{/operations}}

diff --git a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
@@ -14,7 +14,6 @@ PFXPet PetApiTests::createRandomPet() {
 
 void PetApiTests::findPetsByStatusTest() {
     PFXPetApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool petFound = false;
 
@@ -34,7 +33,6 @@ void PetApiTests::findPetsByStatusTest() {
 
 void PetApiTests::createAndGetPetTest() {
     PFXPetApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool petCreated = false;
 
@@ -65,12 +63,10 @@ void PetApiTests::createAndGetPetTest() {
     QTimer::singleShot(14000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(petFetched, "didn't finish within timeout");
-
 }
 
 void PetApiTests::updatePetTest() {
     PFXPetApi api;
-    api.setHost(PetStoreHost);
 
     PFXPet pet = createRandomPet();
     PFXPet petToCheck;
@@ -134,7 +130,6 @@ void PetApiTests::updatePetTest() {
 
 void PetApiTests::updatePetWithFormTest() {
     PFXPetApi api;
-    api.setHost(PetStoreHost);
 
     PFXPet pet = createRandomPet();
     PFXPet petToCheck;

diff --git a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
@@ -14,6 +14,4 @@ private slots:
     void createAndGetPetTest();
     void updatePetTest();
     void updatePetWithFormTest();
-private:
-    const QString PetStoreHost = QStringLiteral("http://petstore.swagger.io");
 };
diff --git a/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp
@@ -6,7 +6,6 @@
 
 void StoreApiTests::placeOrderTest() {
     PFXStoreApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool orderPlaced = false;
 
@@ -33,12 +32,10 @@ void StoreApiTests::placeOrderTest() {
     QTimer::singleShot(14000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(orderPlaced, "didn't finish within timeout");
-
 }
 
 void StoreApiTests::getOrderByIdTest() {
     PFXStoreApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool orderFetched = false;
 
@@ -54,12 +51,10 @@ void StoreApiTests::getOrderByIdTest() {
     QTimer::singleShot(14000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(orderFetched, "didn't finish within timeout");
-
 }
 
 void StoreApiTests::getInventoryTest() {
     PFXStoreApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool inventoryFetched = false;
 
@@ -75,5 +70,4 @@ void StoreApiTests::getInventoryTest() {
     QTimer::singleShot(14000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(inventoryFetched, "didn't finish within timeout");
-
 }
diff --git a/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.h
@@ -11,6 +11,4 @@ private slots:
     void placeOrderTest();
     void getOrderByIdTest();
     void getInventoryTest();
-private:
-    const QString PetStoreHost = QStringLiteral("http://petstore.swagger.io");
 };
diff --git a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp
@@ -19,7 +19,6 @@ PFXUser UserApiTests::createRandomUser() {
 
 void UserApiTests::createUserTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userCreated = false;
 
@@ -36,7 +35,6 @@ void UserApiTests::createUserTest(){
 
 void UserApiTests::createUsersWithArrayInputTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool usersCreated = false;
 
@@ -57,7 +55,6 @@ void UserApiTests::createUsersWithArrayInputTest(){
 
 void UserApiTests::createUsersWithListInputTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool usersCreated = false;
 
@@ -82,7 +79,6 @@ void UserApiTests::createUsersWithListInputTest(){
 
 void UserApiTests::deleteUserTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userDeleted = false;
 
@@ -99,7 +95,6 @@ void UserApiTests::deleteUserTest(){
 
 void UserApiTests::getUserByNameTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userFetched = false;
 
@@ -118,7 +113,6 @@ void UserApiTests::getUserByNameTest(){
 
 void UserApiTests::loginUserTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userLogged = false;
 
@@ -136,7 +130,6 @@ void UserApiTests::loginUserTest(){
 
 void UserApiTests::logoutUserTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userLoggedOut = false;
 
@@ -153,7 +146,6 @@ void UserApiTests::logoutUserTest(){
 
 void UserApiTests::updateUserTest(){
     PFXUserApi api;
-    api.setHost(PetStoreHost);
     QEventLoop loop;
     bool userUpdated = false;
 

diff --git a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h
@@ -18,6 +18,4 @@ private slots:
     void loginUserTest();
     void logoutUserTest();
     void updateUserTest();
-private:
-    const QString PetStoreHost = QStringLiteral("http://petstore.swagger.io");
 };