[cpp qt5 server] Improve qt5 server naming (#655)

* Adapted according to reviews

* Add changed files

* Update beta tag to the naming

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

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

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%

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 {
+public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implements CodegenConfig {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CppQt5ServerCodegen.class);
+    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<String> systemIncludes = new HashSet<String>();
     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

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

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)
 

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)