[C++] minor improvements (#5319)

* minor code format, make sure cpp samples updated

* add new files

bin/utils/ensure-up-to-date

@@ -82,6 +82,8 @@ declare -a samples=(
 "${root}/bin/java-play-framework-petstore-server-all.sh"
 #"${root}/bin/elm-petstore-all.sh"
 "${root}/bin/typescript-redux-query-petstore-with-npm-version.sh"
+"${root}/bin/cpp-restsdk-petstore.sh"
+"${root}/bin/cpp-qt5-qhttpengine-server-petstore.sh"
 )
 
 # Some special case generators may expect to be run as a stanalone process (e.g. modifying classpath)

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

@@ -19,7 +19,6 @@ package org.openapitools.codegen.languages;
 
 import com.google.common.collect.ImmutableMap.Builder;
 import com.samskivert.mustache.Mustache.Lambda;
-
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.io.FilenameUtils;

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

@@ -4,11 +4,7 @@ import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.*;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.meta.features.*;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
@@ -130,6 +126,7 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen
         systemIncludes.add("QDateTime");
         systemIncludes.add("QByteArray");
     }
+
     @Override
     public void processOpts() {
         super.processOpts();

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

@@ -17,19 +17,14 @@
 
 package org.openapitools.codegen.languages;
 
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.servers.Server;
-
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
-import org.openapitools.codegen.utils.URLPathUtils;
 
 import java.io.File;
-import java.net.URL;
 
-import static org.openapitools.codegen.utils.StringUtils.*;
+import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implements CodegenConfig {
 

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

@@ -1 +1 @@
-4.2.3-SNAPSHOT
+4.3.0-SNAPSHOT

samples/client/petstore/cpp-restsdk/client/ApiClient.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiClient.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/IHttpBody.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.3.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION

@@ -0,0 +1 @@
+4.3.0-SNAPSHOT

samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp

@@ -11,6 +11,7 @@
  */
 
 #include <QDebug>
+#include <QJsonParseError>
 #include "OAIHelpers.h"
 
 
@@ -230,6 +231,18 @@ fromStringValue(const QString &inStr, double &value){
     return ok;
 }
 
+bool
+fromStringValue(const QString &inStr, OAIObject &value)
+{
+    QJsonParseError err;
+    QJsonDocument::fromJson(inStr.toUtf8(),&err);
+    if ( err.error == QJsonParseError::NoError ){
+        value.fromJson(inStr);
+        return true;
+    }
+    return false;
+}
+
 bool
 fromStringValue(const QString &inStr, OAIEnum &value){
     value.fromJson(inStr);