Merge pull request #7646 from swagger-api/issue-7634

Issue 7634

Author: HugoMario

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

@@ -46,6 +46,7 @@ public class Generate implements Runnable {
     protected String output = "";
     protected String spec;
     protected String templateDir;
+    protected String templateVersion;
     protected String auth;
     protected List<String> systemProperties = new ArrayList<>();
     protected String configFile;
@@ -93,6 +94,10 @@ public void setTemplateDir(String templateDir) {
         this.templateDir = templateDir;
     }
 
+    public void setTemplateVersion(String templateVersion) {
+        this.templateVersion = templateVersion;
+    }
+
     public void setAuth(String auth) {
         this.auth = auth;
     }
@@ -240,6 +245,10 @@ public void run() {
             configurator.setTemplateDir(templateDir);
         }
 
+        if (isNotEmpty(templateVersion)) {
+            configurator.setTemplateVersion(templateVersion);
+        }
+
         if (isNotEmpty(apiPackage)) {
             configurator.setApiPackage(apiPackage);
         }

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

@@ -45,6 +45,11 @@ components:
           description: "folder containing the template files"
           x-option: "--template-dir"
           x-short-version: "-t"
+        templateVersion:
+          type: "string"
+          title: "template version"
+          description: "version of the template used on generation."
+          x-option: "--template-version"
         auth:
           type: "string"
           title: "authorization"

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

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

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java

@@ -26,6 +26,7 @@ public class CodegenConstants {
     public static final String MODEL_PACKAGE_DESC = "package for generated models";
 
     public static final String TEMPLATE_DIR = "templateDir";
+    public static final String TEMPLATE_VERSION = "templateVersion";
 
     public static final String ALLOW_UNICODE_IDENTIFIERS = "allowUnicodeIdentifiers";
     public static final String ALLOW_UNICODE_IDENTIFIERS_DESC = "boolean, toggles whether unicode identifiers are allowed in names or not, default is false";

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -106,6 +106,7 @@ public class DefaultCodegen implements CodegenConfig {
     protected String templateDir;
     protected String embeddedTemplateDir;
     protected String commonTemplateDir = "_common";
+    protected String templateVersion;
     protected Map<String, Object> additionalProperties = new HashMap<String, Object>();
     protected Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     protected List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
@@ -140,6 +141,10 @@ public void processOpts() {
             this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR));
         }
 
+        if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_VERSION)) {
+            this.setTemplateVersion((String) additionalProperties.get(CodegenConstants.TEMPLATE_VERSION));
+        }
+
         if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
             this.setModelPackage((String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
         }
@@ -490,6 +495,15 @@ public void setTemplateDir(String templateDir) {
         this.templateDir = templateDir;
     }
 
+    @Override
+    public String getTemplateVersion() {
+        return templateVersion;
+    }
+
+    public void setTemplateVersion(String templateVersion) {
+        this.templateVersion = templateVersion;
+    }
+
     public void setModelPackage(String modelPackage) {
         this.modelPackage = modelPackage;
     }

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java

@@ -49,6 +49,7 @@ public class CodegenConfigurator implements Serializable {
     private boolean skipOverwrite;
     private boolean removeOperationIdPrefix;
     private String templateDir;
+    private String templateVersion;
     private String auth;
     private String apiPackage;
     private String modelPackage;
@@ -176,6 +177,15 @@ public CodegenConfigurator setTemplateDir(String templateDir) {
         return this;
     }
 
+    public String getTemplateVersion() {
+        return templateVersion;
+    }
+
+    public CodegenConfigurator setTemplateVersion(String templateVersion) {
+        this.templateVersion = templateVersion;
+        return this;
+    }
+
     public String getAuth() {
         return auth;
     }
@@ -411,6 +421,7 @@ public ClientOptInput toClientOptInput() {
         checkAndSetAdditionalProperty(artifactId, CodegenConstants.ARTIFACT_ID);
         checkAndSetAdditionalProperty(artifactVersion, CodegenConstants.ARTIFACT_VERSION);
         checkAndSetAdditionalProperty(templateDir, toAbsolutePathStr(templateDir), CodegenConstants.TEMPLATE_DIR);
+        checkAndSetAdditionalProperty(templateVersion, CodegenConstants.TEMPLATE_VERSION);
         checkAndSetAdditionalProperty(modelNamePrefix, CodegenConstants.MODEL_NAME_PREFIX);
         checkAndSetAdditionalProperty(modelNameSuffix, CodegenConstants.MODEL_NAME_SUFFIX);
         checkAndSetAdditionalProperty(gitUserId, CodegenConstants.GIT_USER_ID);
@@ -470,6 +481,7 @@ public ClientOptInput toClientOptInput(String content) {
         checkAndSetAdditionalProperty(artifactId, CodegenConstants.ARTIFACT_ID);
         checkAndSetAdditionalProperty(artifactVersion, CodegenConstants.ARTIFACT_VERSION);
         checkAndSetAdditionalProperty(templateDir, toAbsolutePathStr(templateDir), CodegenConstants.TEMPLATE_DIR);
+        checkAndSetAdditionalProperty(templateVersion, CodegenConstants.TEMPLATE_VERSION);
         checkAndSetAdditionalProperty(modelNamePrefix, CodegenConstants.MODEL_NAME_PREFIX);
         checkAndSetAdditionalProperty(modelNameSuffix, CodegenConstants.MODEL_NAME_SUFFIX);
         checkAndSetAdditionalProperty(gitUserId, CodegenConstants.GIT_USER_ID);

modules/swagger-generator/src/main/java/io/swagger/generator/model/Options.java

@@ -28,6 +28,7 @@ public class Options {
     private String httpUserAgent;
     private List<String> reservedWordsMappings;
     private String ignoreFileOverride;
+    private String templateVersion;
     private Boolean removeOperationIdPrefix;
 
     public Options lang(String lang) {
@@ -321,6 +322,19 @@ public Options httpUserAgent(String httpUserAgent) {
         return this;
     }
 
+    public String getTemplateVersion() {
+        return templateVersion;
+    }
+
+    public void setTemplateVersion(String templateVersion) {
+        this.templateVersion = templateVersion;
+    }
+
+    public Options templateVersion(String templateVersion) {
+        this.templateVersion = templateVersion;
+        return this;
+    }
+
     /**
      * HTTP user agent, e.g. codegen_csharp_api_client, default to ';Swagger-Codegen/{packageVersion}}/{language}';
      **/

modules/swagger-generator/src/main/java/io/swagger/generator/util/GeneratorUtil.java

@@ -75,6 +75,9 @@ public static ClientOptInput getClientOptInput(GenerationRequest generationReque
         if (isNotEmpty(options.getReleaseNote())) {
             configurator.setReleaseNote(options.getReleaseNote());
         }
+        if (isNotEmpty(options.getTemplateVersion())) {
+            configurator.setTemplateVersion(options.getTemplateVersion());
+        }
         if (isNotEmpty(options.getHttpUserAgent())) {
             configurator.setHttpUserAgent(options.getHttpUserAgent());
         }
@@ -154,6 +157,9 @@ public static ClientOptInput getClientOptInput(JsonNode node, String outputDir)
         if (node.has("releaseNote")) {
             configurator.setReleaseNote(node.findValue("releaseNote").textValue());
         }
+        if (node.has("templateVersion")) {
+            configurator.setTemplateVersion(node.findValue("templateVersion").textValue());
+        }
         if (node.has("httpUserAgent")) {
             configurator.setHttpUserAgent(node.findValue("httpUserAgent").textValue());
         }

modules/swagger-generator/src/main/resources/openapi.yaml

@@ -138,6 +138,10 @@ components:
           type: "string"
           title: "api package"
           description: "package for generated api classes"
+        templateVersion:
+          type: "string"
+          title: "Template Version"
+          description: "template version for generation"
         modelPackage:
           type: "string"
           title: "model package"