From 534b6b597859997bd06ea2feacafc1a6b97023fc Mon Sep 17 00:00:00 2001 From: sunn <33183834+etherealjoy@users.noreply.github.com> Date: Thu, 26 Jul 2018 19:49:26 +0200 Subject: [PATCH] [cpp qt5 server] Improve qt5 server naming (#655) * Adapted according to reviews * Add changed files * Update beta tag to the naming --- ...=> cpp-qt5-qhttpengine-server-petstore.sh} | 2 +- .../cpp-qt5-qhttpengine-server-petstore.sh | 32 +++++++++++++++++++ .../cpp-qt5-qhttpengine-server-petstore.bat | 10 ++++++ ...va => CppQt5QHttpEngineServerCodegen.java} | 16 +++++----- .../org.openapitools.codegen.CodegenConfig | 2 +- .../CMakeLists.txt.mustache | 2 +- .../Dockerfile.mustache | 0 .../LICENSE.txt.mustache | 0 .../Makefile.mustache | 0 .../README.md.mustache | 0 .../apihandler.cpp.mustache | 0 .../apihandler.h.mustache | 0 .../apirequest.cpp.mustache | 0 .../apirequest.h.mustache | 0 .../apirouter.cpp.mustache | 0 .../apirouter.h.mustache | 0 .../helpers-body.mustache | 0 .../helpers-header.mustache | 0 .../licenseInfo.mustache | 0 .../main.cpp.mustache | 0 .../model-body.mustache | 0 .../model-header.mustache | 0 .../object.mustache | 0 .../src-CMakeLists.txt.mustache | 0 .../server/CMakeLists.txt | 2 +- .../server/Dockerfile | 0 .../server/LICENSE.txt | 0 .../server/Makefile | 0 .../server/README.MD | 0 .../server/src/CMakeLists.txt | 0 .../server/src/handlers/OAIApiRouter.cpp} | 0 .../server/src/handlers/OAIApiRouter.h} | 0 .../server/src/handlers/OAIPetApiHandler.cpp | 0 .../server/src/handlers/OAIPetApiHandler.h | 0 .../src/handlers/OAIStoreApiHandler.cpp | 0 .../server/src/handlers/OAIStoreApiHandler.h | 0 .../server/src/handlers/OAIUserApiHandler.cpp | 0 .../server/src/handlers/OAIUserApiHandler.h | 0 .../server/src/main.cpp | 0 .../server/src/models/OAIApiResponse.cpp | 0 .../server/src/models/OAIApiResponse.h | 0 .../server/src/models/OAICategory.cpp | 0 .../server/src/models/OAICategory.h | 0 .../server/src/models/OAIHelpers.cpp | 0 .../server/src/models/OAIHelpers.h | 0 .../server/src/models/OAIObject.h | 0 .../server/src/models/OAIOrder.cpp | 0 .../server/src/models/OAIOrder.h | 0 .../server/src/models/OAIPet.cpp | 0 .../server/src/models/OAIPet.h | 0 .../server/src/models/OAITag.cpp | 0 .../server/src/models/OAITag.h | 0 .../server/src/models/OAIUser.cpp | 0 .../server/src/models/OAIUser.h | 0 .../server/src/requests/OAIPetApiRequest.cpp | 0 .../server/src/requests/OAIPetApiRequest.h | 0 .../src/requests/OAIStoreApiRequest.cpp | 0 .../server/src/requests/OAIStoreApiRequest.h | 0 .../server/src/requests/OAIUserApiRequest.cpp | 0 .../server/src/requests/OAIUserApiRequest.h | 0 60 files changed, 54 insertions(+), 12 deletions(-) rename bin/{cpp-qt5-server-petstore.sh => cpp-qt5-qhttpengine-server-petstore.sh} (81%) create mode 100755 bin/openapi3/cpp-qt5-qhttpengine-server-petstore.sh create mode 100644 bin/windows/cpp-qt5-qhttpengine-server-petstore.bat rename modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/{CppQt5ServerCodegen.java => CppQt5QHttpEngineServerCodegen.java} (97%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/CMakeLists.txt.mustache (92%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/Dockerfile.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/LICENSE.txt.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/Makefile.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/README.md.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apihandler.cpp.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apihandler.h.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apirequest.cpp.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apirequest.h.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apirouter.cpp.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/apirouter.h.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/helpers-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/helpers-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/licenseInfo.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/main.cpp.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/model-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/object.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/src-CMakeLists.txt.mustache (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/CMakeLists.txt (92%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/Dockerfile (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/LICENSE.txt (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/Makefile (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/README.MD (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/CMakeLists.txt (100%) rename samples/server/petstore/{cpp-qt5-server/server/src/handlers/OAIapirouter.cpp => cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp} (100%) rename samples/server/petstore/{cpp-qt5-server/server/src/handlers/OAIapirouter.h => cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h} (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIPetApiHandler.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIPetApiHandler.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIStoreApiHandler.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIStoreApiHandler.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIUserApiHandler.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/handlers/OAIUserApiHandler.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/main.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIApiResponse.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIApiResponse.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAICategory.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAICategory.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIHelpers.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIHelpers.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIObject.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIOrder.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIOrder.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIPet.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIPet.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAITag.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAITag.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIUser.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/models/OAIUser.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIPetApiRequest.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIPetApiRequest.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIStoreApiRequest.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIStoreApiRequest.h (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIUserApiRequest.cpp (100%) rename samples/server/petstore/{cpp-qt5-server => cpp-qt5-qhttpengine-server}/server/src/requests/OAIUserApiRequest.h (100%) diff --git a/bin/cpp-qt5-server-petstore.sh b/bin/cpp-qt5-qhttpengine-server-petstore.sh similarity index 81% rename from bin/cpp-qt5-server-petstore.sh rename to bin/cpp-qt5-qhttpengine-server-petstore.sh index 5a367c70ceb..14f084f9e7b 100755 --- a/bin/cpp-qt5-server-petstore.sh +++ b/bin/cpp-qt5-qhttpengine-server-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-server -o samples/server/petstore/cpp-qt5-server $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-qhttpengine-server -o samples/server/petstore/cpp-qt5-qhttpengine-server $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/openapi3/cpp-qt5-qhttpengine-server-petstore.sh b/bin/openapi3/cpp-qt5-qhttpengine-server-petstore.sh new file mode 100755 index 00000000000..e433a40634c --- /dev/null +++ b/bin/openapi3/cpp-qt5-qhttpengine-server-petstore.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +SCRIPT="$0" +echo "# START SCRIPT: $SCRIPT" + +while [ -h "$SCRIPT" ] ; do + ls=`ls -ld "$SCRIPT"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SCRIPT="$link" + else + SCRIPT=`dirname "$SCRIPT"`/"$link" + fi +done + +if [ ! -d "${APP_DIR}" ]; then + APP_DIR=`dirname "$SCRIPT"`/.. + APP_DIR=`cd "${APP_DIR}"; pwd` +fi + +executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar" + +if [ ! -f "$executable" ] +then + mvn clean package +fi + +# if you've executed sbt assembly previously it will use that instead. +export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5-qhttpengine-server -o samples/client/petstore/cpp-qt5-qhttpengine-server $@" + +java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/cpp-qt5-qhttpengine-server-petstore.bat b/bin/windows/cpp-qt5-qhttpengine-server-petstore.bat new file mode 100644 index 00000000000..3128febff60 --- /dev/null +++ b/bin/windows/cpp-qt5-qhttpengine-server-petstore.bat @@ -0,0 +1,10 @@ +set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5-qhttpengine-server -o samples\server\petstore\cpp-qt5-qhttpengine-server + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java similarity index 97% rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index 7d2be8a6784..ace3b24b9b5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -33,8 +33,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5ServerCodegen.class); +public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implements CodegenConfig { + 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)."; @@ -52,13 +52,13 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo protected Set systemIncludes = new HashSet(); protected String cppNamespace = "OpenAPI"; - public CppQt5ServerCodegen() { + public CppQt5QHttpEngineServerCodegen() { super(); // set the output folder here - outputFolder = "generated-code/cpp-qt5-server"; + outputFolder = "generated-code/cpp-qt5-qhttpengine-server"; - // set modelNamePrefix as default for QT5CPP + // set modelNamePrefix as default for QHttpEngine Server if (StringUtils.isEmpty(modelNamePrefix)) { modelNamePrefix = PREFIX; } @@ -102,7 +102,7 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo * Template Location. This is the location which templates will be read from. The generator * will use the resource stream to attempt to read the templates. */ - embeddedTemplateDir = templateDir = "cpp-qt5-server"; + embeddedTemplateDir = templateDir = "cpp-qt5-qhttpengine-server"; // CLI options addOption(CPP_NAMESPACE, CPP_NAMESPACE_DESC, this.cppNamespace); @@ -230,7 +230,7 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo */ @Override public String getName() { - return "cpp-qt5-server"; + return "cpp-qt5-qhttpengine-server"; } /** @@ -241,7 +241,7 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo */ @Override public String getHelp() { - return "Generates a Qt5 C++ Server using the QHTTPEngine HTTP Library."; + return "Generates a Qt5 C++ Server (beta) using the QHTTPEngine HTTP Library."; } @Override diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig index 370e4540249..1dfb88188df 100644 --- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig +++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig @@ -8,7 +8,7 @@ org.openapitools.codegen.languages.BashClientCodegen org.openapitools.codegen.languages.ClojureClientCodegen org.openapitools.codegen.languages.ConfluenceWikiCodegen org.openapitools.codegen.languages.CppQt5ClientCodegen -org.openapitools.codegen.languages.CppQt5ServerCodegen +org.openapitools.codegen.languages.CppQt5QHttpEngineServerCodegen org.openapitools.codegen.languages.CppPistacheServerCodegen org.openapitools.codegen.languages.CppRestbedServerCodegen org.openapitools.codegen.languages.CppRestSdkClientCodegen diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/CMakeLists.txt.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/CMakeLists.txt.mustache similarity index 92% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/CMakeLists.txt.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/CMakeLists.txt.mustache index 1df138241db..527b76ca9b4 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-server/CMakeLists.txt.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/CMakeLists.txt.mustache @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2 FATAL_ERROR) -project(cpp-qt5-server) +project(cpp-qt5-qhttpengine-server) include(ExternalProject) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/Dockerfile.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/Dockerfile.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/Dockerfile.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/Dockerfile.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/LICENSE.txt.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/LICENSE.txt.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/LICENSE.txt.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/LICENSE.txt.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/Makefile.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/Makefile.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/Makefile.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/Makefile.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/README.md.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/README.md.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/README.md.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/README.md.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apihandler.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.cpp.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apihandler.cpp.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.cpp.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apihandler.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apihandler.h.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apihandler.h.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apirequest.cpp.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apirequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apirequest.h.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.h.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apirouter.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apirouter.cpp.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.cpp.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/apirouter.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.h.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/apirouter.h.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirouter.h.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/helpers-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-body.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/helpers-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/helpers-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/licenseInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/licenseInfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/licenseInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/main.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/main.cpp.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/model-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/object.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-server/src-CMakeLists.txt.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/src-CMakeLists.txt.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpp-qt5-server/src-CMakeLists.txt.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/src-CMakeLists.txt.mustache diff --git a/samples/server/petstore/cpp-qt5-server/server/CMakeLists.txt b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/CMakeLists.txt similarity index 92% rename from samples/server/petstore/cpp-qt5-server/server/CMakeLists.txt rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/CMakeLists.txt index 1df138241db..527b76ca9b4 100644 --- a/samples/server/petstore/cpp-qt5-server/server/CMakeLists.txt +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2 FATAL_ERROR) -project(cpp-qt5-server) +project(cpp-qt5-qhttpengine-server) include(ExternalProject) diff --git a/samples/server/petstore/cpp-qt5-server/server/Dockerfile b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/Dockerfile similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/Dockerfile rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/Dockerfile diff --git a/samples/server/petstore/cpp-qt5-server/server/LICENSE.txt b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/LICENSE.txt similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/LICENSE.txt rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/LICENSE.txt diff --git a/samples/server/petstore/cpp-qt5-server/server/Makefile b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/Makefile similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/Makefile rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/Makefile diff --git a/samples/server/petstore/cpp-qt5-server/server/README.MD b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/README.MD rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD diff --git a/samples/server/petstore/cpp-qt5-server/server/src/CMakeLists.txt b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/CMakeLists.txt similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/CMakeLists.txt rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/CMakeLists.txt diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIapirouter.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIapirouter.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIapirouter.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIapirouter.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIPetApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIPetApiHandler.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIPetApiHandler.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIStoreApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIStoreApiHandler.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIStoreApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIStoreApiHandler.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIUserApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIUserApiHandler.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIUserApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/handlers/OAIUserApiHandler.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/main.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/main.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIApiResponse.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIApiResponse.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIApiResponse.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIApiResponse.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAICategory.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAICategory.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAICategory.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAICategory.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIHelpers.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIHelpers.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIHelpers.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIHelpers.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIObject.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIObject.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIOrder.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIOrder.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIOrder.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIOrder.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIPet.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIPet.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIPet.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIPet.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAITag.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAITag.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAITag.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAITag.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIUser.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIUser.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/models/OAIUser.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/models/OAIUser.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIPetApiRequest.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIPetApiRequest.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIStoreApiRequest.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIStoreApiRequest.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIUserApiRequest.cpp rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp diff --git a/samples/server/petstore/cpp-qt5-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h similarity index 100% rename from samples/server/petstore/cpp-qt5-server/server/src/requests/OAIUserApiRequest.h rename to samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h