Merge branch '3.0.0' into patch-1

Author: HugoMario

README.md

@@ -441,9 +441,9 @@ Other languages have petstore samples, too:
 It's just as easy--just use the `-i` flag to point to either a server or file.
 
 ### Modifying the client library format
-Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger Codegen processes mustache templates with the [jmustache](https://github.com/samskivert/jmustache) engine.  You can modify our templates or make your own.
+Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger Codegen processes handlebar templates with the [Handlebars.java](https://github.com/jknack/handlebars.java) engine.  You can modify our templates or make your own.
 
-You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
+You can look at [swagger-codegen-generators](https://github.com/swagger-api/swagger-codegen-generators/tree/master/src/main/resources/handlebars) for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
 
 ### Making your own codegen modules
 If you're starting a project with a new language and don't see what you need, Swagger Codegen can help you create a project to generate your own libraries:

bin/go-petstore-mixed.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+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/swagger-codegen-cli/target/swagger-codegen-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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l go -o samples/client/petstore/go/go-petstore-mixed/swagger --flatten-inline-schema"
+
+java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-mixed-server-v3.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+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/swagger-codegen-cli/target/swagger-codegen-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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l nodejs-server -o samples/server/petstore/nodejs-petstore-mixed -Dservice"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-fetch-petstore-mixed-with-npm-version.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+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/swagger-codegen-cli/target/swagger-codegen-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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/mixed-with-npm-version"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-fetch-petstore-with-npm-version.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/with-npm-version"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/with-npm-version"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Generate.java

@@ -77,6 +77,7 @@ public class Generate implements Runnable {
     protected Boolean disableExamples;
     protected Boolean resolveFully;
     protected Boolean ignoreImportMappings;
+    protected Boolean flattenInlineSchema;
     private String url;
     private List<CodegenArgument> codegenArguments;
 
@@ -224,6 +225,10 @@ public void setResolveFully(Boolean resolveFully) {
         this.resolveFully = resolveFully;
     }
 
+    public void setFlattenInlineSchema(Boolean flattenInlineSchema) {
+        this.flattenInlineSchema = flattenInlineSchema;
+    }
+
     public void setIgnoreImportMappings(Boolean ignoreImportMappings) {
         this.ignoreImportMappings = ignoreImportMappings;
     }
@@ -331,6 +336,10 @@ public void run() {
             configurator.setIgnoreFileOverride(ignoreFileOverride);
         }
 
+        if (flattenInlineSchema != null) {
+            configurator.setFlattenInlineSchema(flattenInlineSchema);
+        }
+
         if (removeOperationIdPrefix != null) {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }

modules/swagger-codegen-cli/src/main/resources/oas3.yaml

@@ -210,7 +210,12 @@ components:
           type: "boolean"
           title: "fully resolve schemas"
           description: "fully resolves json schemas when loading definitions."
-          x-option: "--resolve-fully"          
+          x-option: "--resolve-fully"
+        flattenInlineSchema:
+          type: "boolean"
+          title: "flatten inline schemas"
+          description: "flattens inline composed schemas."
+          x-option: "--flatten-inline-schema"
     ConfigHelp:
       x-command: "config-help"
       x-command-description: "Config help for chosen lang"

modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/v3/maven/plugin/CodeGenMojo.java

@@ -2,12 +2,12 @@
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -52,7 +52,7 @@
 /**
  * Goal which generates client/server code from a swagger json/yaml definition.
  */
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true)
 public class CodeGenMojo extends AbstractMojo {
 
     @Parameter(name = "verbose", required = false, defaultValue = "false")
@@ -220,7 +220,7 @@ public class CodeGenMojo extends AbstractMojo {
      * A map of reserved names and how they should be escaped
      */
     @Parameter(name = "reservedWordsMappings")
-    private List<String> reservedWordsMappings;    
+    private List<String> reservedWordsMappings;
 
     /**
      * Generate the apis
@@ -314,6 +314,13 @@ public class CodeGenMojo extends AbstractMojo {
 
     @Override
     public void execute() throws MojoExecutionException {
+        // Using the naive approach for achieving thread safety
+        synchronized (CodeGenMojo.class) {
+            execute_();
+        }
+    }
+
+    protected void execute_() throws MojoExecutionException {
 
         if (skip) {
             getLog().info("Code generation is skipped.");

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/AbstractGenerator.java

@@ -86,13 +86,25 @@ public String getFullTemplateFile(CodegenConfig config, String templateFile) {
         final String library = config.getLibrary();
         if (StringUtils.isNotEmpty(library)) {
             //look for the file in the library subfolder of the supplied template
+            if (StringUtils.isNotBlank(config.customTemplateDir())) {
+                final String libTemplateFile = buildLibraryFilePath(config.customTemplateDir(), library, templateFile);
+                if (new File(libTemplateFile).exists()) {
+                    return libTemplateFile;
+                }
+            }
             final String libTemplateFile = buildLibraryFilePath(config.templateDir(), library, templateFile);
             if (new File(libTemplateFile).exists()) {
                 return libTemplateFile;
             }
         }
 
         //check the supplied template main folder for the file
+        if (StringUtils.isNotBlank(config.customTemplateDir())) {
+            final String template = config.customTemplateDir() + File.separator + templateFile;
+            if (new File(template).exists()) {
+                return template;
+            }
+        }
         final String template = config.templateDir() + File.separator + templateFile;
         if (new File(template).exists()) {
             return template;

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java

@@ -41,6 +41,8 @@ public interface CodegenConfig {
 
     String embeddedTemplateDir();
 
+    String customTemplateDir();
+
     String getTemplateVersion();
 
     String modelFileFolder();