Issue #177: updated resource template dir for generators.

HugoMario · HugoMario · commit 477b87710433 · 2018-09-22T05:17:48.000-05:00
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -106,7 +106,7 @@ public abstract class DefaultCodegenConfig implements CodegenConfig {
 
     public static final String DEFAULT_CONTENT_TYPE = "application/json";
     public static final String REQUEST_BODY_NAME = "body";
-    public static final String DEFAULT_TEMPLATE_VERSION = "v2";
+    public static final String DEFAULT_TEMPLATE_DIR = "handlebars";
 
     protected String inputSpec;
     protected String outputFolder = StringUtils.EMPTY;
diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticDocCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticDocCodegen.java
@@ -76,13 +76,7 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/swagger-static", templateVersion);
-        }
-        else {
-            embeddedTemplateDir = templateDir = String.format("%s/swagger-static", DEFAULT_TEMPLATE_VERSION);
-        }
+        embeddedTemplateDir = templateDir = String.format("%s/swagger-static", DEFAULT_TEMPLATE_DIR);
     }
 
     @Override
diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtml2Codegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtml2Codegen.java
@@ -144,13 +144,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
     public void processOpts() {
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", templateVersion);
-        }
-        else {
-            embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", DEFAULT_TEMPLATE_VERSION);
-        }
+        embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", DEFAULT_TEMPLATE_DIR);
     }
 
     @Override
diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java
@@ -126,13 +126,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
     public void processOpts() {
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", templateVersion);
-        }
-        else {
-            embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", DEFAULT_TEMPLATE_VERSION);
-        }
+        embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", DEFAULT_TEMPLATE_DIR);
     }
 
     @Override
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegen.java
@@ -68,11 +68,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_DIR);
         }
 
         // clear model and api doc template as this codegen
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java
@@ -100,11 +100,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_DIR);
         }
 
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java
@@ -122,11 +122,7 @@ public void processOpts() {
         super.processOpts();
         if (StringUtils.isBlank(templateDir)) {
             String templateVersion = getTemplateVersion();
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", DEFAULT_TEMPLATE_DIR);
         }
 
         if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaInflectorServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaInflectorServerCodegen.java
@@ -74,12 +74,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            String templateVersion = getTemplateVersion();
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", DEFAULT_TEMPLATE_DIR);
         }
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSCXFCDIServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSCXFCDIServerCodegen.java
@@ -43,12 +43,7 @@ public void processOpts() {
         // Set the template dir first, before super.processOpts(), otherwise it is going to
         // be set to /spec location.
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", templateVersion);
-            }
-            else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", DEFAULT_TEMPLATE_DIR);
         }
 
         super.processOpts();
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java
@@ -76,11 +76,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", DEFAULT_TEMPLATE_DIR);
         }
 
         modelTemplateFiles.put("model.mustache", ".java");
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyServerCodegen.java
@@ -88,11 +88,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME, templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME, DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME, DEFAULT_TEMPLATE_DIR);
         }
 
         addTemplateFiles();
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyEapServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyEapServerCodegen.java
@@ -60,11 +60,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy/eap", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy/eap", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy/eap", DEFAULT_TEMPLATE_DIR);
         }
 
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyServerCodegen.java
@@ -52,11 +52,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy", DEFAULT_TEMPLATE_DIR);
         }
 
         apiTemplateFiles.put("apiService.mustache", ".java");
diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java
@@ -78,11 +78,8 @@ public void setDateLibrary(String library) {
     public void processOpts() {
         super.processOpts();        
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/kotlin-client", templateVersion);
-        } else {
-            embeddedTemplateDir = templateDir = String.format("%s/kotlin-client", DEFAULT_TEMPLATE_VERSION);
+        if (StringUtils.isBlank(templateDir)) {
+            embeddedTemplateDir = templateDir = String.format("%s/kotlin-client", DEFAULT_TEMPLATE_DIR);
         }
 
         if (additionalProperties.containsKey(DATE_LIBRARY)) {
diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java
@@ -163,11 +163,8 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
     public void processOpts() {
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/kotlin-server", templateVersion);
-        } else {
-            embeddedTemplateDir = templateDir = String.format("%s/kotlin-server", DEFAULT_TEMPLATE_VERSION);
+        if (StringUtils.isBlank(templateDir)) {
+            embeddedTemplateDir = templateDir = String.format("%s/kotlin-server", DEFAULT_TEMPLATE_DIR);
         }
 
         if (!additionalProperties.containsKey(GENERATE_APIS)) {
diff --git a/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java
@@ -239,12 +239,7 @@ public void processOpts() {
 
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = String.format("%s" + File.separator + "php", templateVersion);
-        } else {
-            embeddedTemplateDir = String.format("%s" + File.separator + "php", DEFAULT_TEMPLATE_VERSION);
-        }
+        embeddedTemplateDir = String.format("%s" + File.separator + "php", DEFAULT_TEMPLATE_DIR);
         if (StringUtils.isBlank(templateDir)) {
             templateDir = embeddedTemplateDir;
         }
diff --git a/src/main/java/io/swagger/codegen/v3/generators/swift/AbstractSwiftCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/swift/AbstractSwiftCodegen.java
@@ -145,11 +145,8 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc
     public void processOpts() {
         super.processOpts();
 
-        String templateVersion = getTemplateVersion();
-        if (StringUtils.isNotBlank(templateVersion)) {
-            embeddedTemplateDir = templateDir = String.format("%s/%s", templateVersion, getName());
-        } else {
-            embeddedTemplateDir = templateDir = String.format("%s/%s", DEFAULT_TEMPLATE_VERSION, getName());
+        if (StringUtils.isNotBlank(templateDir)) {
+            embeddedTemplateDir = templateDir = String.format("%s/%s", DEFAULT_TEMPLATE_DIR, getName());
         }
 
         // Setup project name
diff --git a/src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java
@@ -79,12 +79,7 @@ public void processOpts() {
         super.processOpts();
 
         if (StringUtils.isBlank(templateDir)) {
-            String templateVersion = getTemplateVersion();
-            if (StringUtils.isNotBlank(templateVersion)) {
-                embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "typescript-angular", templateVersion);
-            } else {
-                embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "typescript-angular", DEFAULT_TEMPLATE_VERSION);
-            }
+            embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "typescript-angular", DEFAULT_TEMPLATE_DIR);
         }
 
         modelTemplateFiles.put("model.mustache", ".ts");
diff --git a/src/test/java/io/swagger/codegen/v3/generators/java/JavaClientCodegenTest.java b/src/test/java/io/swagger/codegen/v3/generators/java/JavaClientCodegenTest.java
@@ -254,7 +254,7 @@ public void testPackageNamesSetInvokerDerivedFromModel() throws Exception {
     public void customTemplates() throws Exception {
         final JavaClientCodegen codegen = new JavaClientCodegen();
         codegen.processOpts();
-        Assert.assertEquals(codegen.templateDir(), "v2" + File.separator  + "Java");
+        Assert.assertEquals(codegen.templateDir(), "handlebars" + File.separator  + "Java");
 
         codegen.additionalProperties().put(CodegenConstants.TEMPLATE_DIR, String.join(File.separator,"user", "custom", "location"));
         codegen.processOpts();
diff --git a/src/test/java/io/swagger/codegen/v3/generators/php/PhpClientCodegenTest.java b/src/test/java/io/swagger/codegen/v3/generators/php/PhpClientCodegenTest.java
@@ -20,8 +20,8 @@ public void testInitialValues() throws Exception {
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.TRUE);
         Assert.assertEquals(codegen.getHideGenerationTimestamp(), Boolean.TRUE);
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
-        Assert.assertEquals(codegen.templateDir(), "v2/php");
-        Assert.assertEquals(codegen.embeddedTemplateDir(), "v2/php");
+        Assert.assertEquals(codegen.templateDir(), "handlebars/php");
+        Assert.assertEquals(codegen.embeddedTemplateDir(), "handlebars/php");
     }
 
     @Test
@@ -74,7 +74,7 @@ public void testPutTemplateDirProperty() throws Exception {
         codegen.processOpts();
 
         Assert.assertEquals(codegen.templateDir(), "/absolute/path");
-        Assert.assertEquals(codegen.embeddedTemplateDir(), "v2/php");
+        Assert.assertEquals(codegen.embeddedTemplateDir(), "handlebars/php");
     }
 
 
