adjust template folder to lang option (#2959)

* adjust template folder to lang option : scala-finch, java-msf4j, java-undertow, php-ze-ph

* Changing file permissions

* move ze-ph and finch resources folder

bin/java-msf4j-petstore-server.sh

@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/MSF4J -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@"
+ags="generate -t modules/openapi-generator/src/main/resources/java-msf4j-server -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@"
 
 echo "Removing files and folders under samples/server/petstore/java-msf4j/src/main"
 rm -rf samples/server/petstore/java-msf4j/src/main

bin/java-undertow-petstore-server.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/undertow -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/undertow --additional-properties hideGenerationTimestamp=true $@"
+ags="generate -t modules/openapi-generator/src/main/resources/java-undertow-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/java-undertow --additional-properties hideGenerationTimestamp=true $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/finch-petstore-server.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate $@ -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch"
+ags="generate $@ -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch"
 
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/php-ze-ph-petstore-server.sh

@@ -27,7 +27,7 @@ fi
 
 input=modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 out_folder=samples/server/openapi3/petstore/php-ze-ph
-resources=modules/openapi-generator/src/main/resources/ze-ph
+resources=modules/openapi-generator/src/main/resources/php-ze-ph
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"

bin/php-ze-ph-petstore-server.sh

@@ -27,7 +27,7 @@ fi
 
 input=modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 out_folder=samples/server/petstore/php-ze-ph
-resources=modules/openapi-generator/src/main/resources/ze-ph
+resources=modules/openapi-generator/src/main/resources/php-ze-ph
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"

bin/finch-petstore-server.sh → bin/scala-finch-petstore-server.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch $@"
+ags="generate -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/windows/ze-ph-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\ze-ph
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\php-ze-ph
 
 java %JAVA_OPTS% -jar %executable% %ags%

docs/templating.md

@@ -7,7 +7,7 @@ It's easy to work with templates for codegen!
 
 The generator workflow has [transforming logic](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages) as well as templates for each generation of code.
 
-Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates.  While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [FinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java) for an advanced example).
+Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates.  While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [ScalaFinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java) for an advanced example).
 
 The transform logic needs to implement [CodegenConfig.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java) and is most easily done by extending [DefaultCodegen.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java).  Take a look at the various implementations as a guideline while the instructions get more complete.
 

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

@@ -44,7 +44,7 @@ public JavaMSF4JServerCodegen() {
         apiTestTemplateFiles.clear();
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");
-        embeddedTemplateDir = templateDir = "MSF4J";
+        embeddedTemplateDir = templateDir = "java-msf4j-server";
         CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC);
         supportedLibraries.put(LIBRARY_JERSEY1, "Jersey core 1.x");
         supportedLibraries.put(LIBRARY_JERSEY2, "Jersey core 2.x");

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

@@ -40,7 +40,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen {
     public JavaUndertowServerCodegen() {
         super();
 
-        embeddedTemplateDir = templateDir = "undertow";
+        embeddedTemplateDir = templateDir = "java-undertow-server";
         invokerPackage = "org.openapitools.handler";
         artifactId = "openapi-undertow-server";
         dateLibrary = "legacy"; //TODO: add joda support

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

@@ -60,7 +60,7 @@ public PhpZendExpressivePathHandlerServerCodegen() {
         //no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration
         typeMapping.put("double", "float");
 
-        embeddedTemplateDir = templateDir = "ze-ph";
+        embeddedTemplateDir = templateDir = "php-ze-ph";
         invokerPackage = "App";
         srcBasePath = "src" + File.separator + "App";
         apiDirName = "Handler";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java → modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java

@@ -25,20 +25,20 @@
 import java.io.File;
 import java.util.*;
 
-public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig {
+public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "org.openapitools.client";
     protected String groupId = "org.openapitools";
     protected String artifactId = "finch-server";
     protected String artifactVersion = "1.0.0";
     protected String sourceFolder = "src/main/scala";
     protected String packageName = "org.openapitools";
 
-    public FinchServerCodegen() {
+    public ScalaFinchServerCodegen() {
         super();
         outputFolder = "generated-code/finch";
         modelTemplateFiles.put("model.mustache", ".scala");
         apiTemplateFiles.put("api.mustache", ".scala");
-        embeddedTemplateDir = templateDir = "finch";
+        embeddedTemplateDir = templateDir = "scala-finch";
 
         apiPackage = packageName + ".apis";
         modelPackage = packageName + ".models";

modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig

@@ -27,7 +27,6 @@ org.openapitools.codegen.languages.ErlangClientCodegen
 org.openapitools.codegen.languages.ErlangProperCodegen
 org.openapitools.codegen.languages.ErlangServerCodegen
 org.openapitools.codegen.languages.FlashClientCodegen
-org.openapitools.codegen.languages.FinchServerCodegen
 org.openapitools.codegen.languages.GoClientCodegen
 org.openapitools.codegen.languages.GoServerCodegen
 org.openapitools.codegen.languages.GoGinServerCodegen
@@ -85,6 +84,7 @@ org.openapitools.codegen.languages.RustClientCodegen
 org.openapitools.codegen.languages.RustServerCodegen
 org.openapitools.codegen.languages.ScalatraServerCodegen
 org.openapitools.codegen.languages.ScalaAkkaClientCodegen
+org.openapitools.codegen.languages.ScalaFinchServerCodegen
 org.openapitools.codegen.languages.ScalaHttpClientCodegen
 org.openapitools.codegen.languages.ScalaGatlingCodegen
 org.openapitools.codegen.languages.ScalaLagomServerCodegen

modules/openapi-generator/src/main/resources/finch/README.mustache → modules/openapi-generator/src/main/resources/scala-finch/README.mustache

@@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t
 [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
 is an example of building a OpenAPI-enabled scalatra server.
 
-This example uses the [finch](http://github.com/finagle/finch/) framework.  To see how to make this your own, look here:
-
-[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch)
-
+This example uses the [finch](http://github.com/finagle/finch/) framework.
 
 ### After generation
 
-Run `scalafix RemoveUnusedImports` to cleanup unused imports.
+Run `scalafix RemoveUnusedImports` to cleanup unused imports.

pom.xml

@@ -993,15 +993,15 @@
             </modules>
         </profile>
         <profile>
-            <id>java-undertowr</id>
+            <id>java-undertow</id>
             <activation>
                 <property>
                     <name>env</name>
                     <value>java</value>
                 </property>
             </activation>
             <modules>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
             </modules>
         </profile>
         <profile>
@@ -1114,7 +1114,7 @@
                 <module>samples/server/petstore/java-play-framework-fake-endpoints</module>
                 <module>samples/server/petstore/java-play-framework-controller-only</module>
                 <module>samples/server/petstore/java-play-framework-api-package-override</module>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey1-useTags</module>
                 <!-- move to other CI as the following fails often in CircleCI
@@ -1143,7 +1143,7 @@
                 <module>samples/server/petstore/scala-lagom-server</module>
                 <module>samples/server/petstore/scala-play-server</module>
                 <module>samples/server/petstore/scalatra</module>
-                <module>samples/server/petstore/finch</module>
+                <module>samples/server/petstore/scala-finch</module>
                 <module>samples/server/petstore/kotlin-springboot</module>
             </modules>
         </profile>
@@ -1184,7 +1184,7 @@
                 <module>samples/server/petstore/java-vertx/rx</module>
                 <module>samples/server/petstore/java-vertx/async</module>
                 <module>samples/server/petstore/java-inflector</module>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs/jersey1-useTags</module>

samples/server/petstore/java-undertow/.openapi-generator/VERSION

@@ -0,0 +1 @@
+4.0.1-SNAPSHOT

samples/server/petstore/finch/README.md → samples/server/petstore/scala-finch/README.md

@@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t
 [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
 is an example of building a OpenAPI-enabled scalatra server.
 
-This example uses the [finch](http://github.com/finagle/finch/) framework.  To see how to make this your own, look here:
-
-[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch)
-
+This example uses the [finch](http://github.com/finagle/finch/) framework.
 
 ### After generation
 
-Run `scalafix RemoveUnusedImports` to cleanup unused imports.
+Run `scalafix RemoveUnusedImports` to cleanup unused imports.