Merge pull request #680 from swagger-api/mustache_template_removing

Mustache template removing

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java

@@ -149,7 +149,7 @@ public void processOpts() {
             supportingFiles.add(new SupportingFile("Filters" + File.separator + "BasePathFilter.mustache", packageFolder + File.separator + "Filters", "BasePathFilter.cs"));
             supportingFiles.add(new SupportingFile("Filters" + File.separator + "GeneratePathParamsValidationFilter.mustache", packageFolder + File.separator + "Filters", "GeneratePathParamsValidationFilter.cs"));
             supportingFiles.add(new SupportingFile("Startup.mustache", packageFolder, "Startup.cs"));
-        } else if (aspNetCoreVersion.equals("2.1")) {
+        } else if (aspNetCoreVersion.equals("2.1") || aspNetCoreVersion.equals("2.2")) {
             apiTemplateFiles.put("2.1/controller.mustache", ".cs");
             addInterfaceControllerTemplate();
 

src/main/java/io/swagger/codegen/v3/generators/scala/AbstractScalaCodegen.java

@@ -254,10 +254,4 @@ protected String stripPackageName(String input) {
         int lastIndexOfDot = input.lastIndexOf(".");
         return input.substring(lastIndexOfDot + 1);
     }
-
-    // todo: remove this once handlebar templates for this generator are implemented
-    @Override
-    protected void setTemplateEngine() {
-        templateEngine = new MustacheTemplateEngine(this);
-    }
 }

src/main/resources/mustache/scala/akka-http-server/api.mustache renamed to src/main/resources/handlebars/scala/akka-http-server/api.mustache

@@ -35,7 +35,7 @@ class {{classname}}(
          {{#headerParams}} }{{/headerParams}}
        {{^queryParams.isEmpty}} }{{/queryParams.isEmpty}}
       }
-    }{{^-last}} ~{{/-last}}
+    }{{^@last}} ~{{/@last}}
   {{/operation}}
 }
 
@@ -50,7 +50,7 @@ trait {{classname}}Service {
    {{/responses}}
    */
   def {{operationId}}({{#vendorExtensions.paramsWithSupportedType}}{{paramName}}: {{^required}}{{^isBodyParam}}Option[{{/isBodyParam}}{{/required}}{{dataType}}{{^required}}{{^isBodyParam}}]{{/isBodyParam}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.paramsWithSupportedType}}){{^vendorExtensions.complexReturnTypes.isEmpty}}
-      (implicit {{#vendorExtensions.complexReturnTypes}}toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]{{^-last}}, {{/-last}}{{/vendorExtensions.complexReturnTypes}}){{/vendorExtensions.complexReturnTypes.isEmpty}}: Route
+      (implicit {{#vendorExtensions.complexReturnTypes}}toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]{{^@last}}, {{/@last}}{{/vendorExtensions.complexReturnTypes}}){{/vendorExtensions.complexReturnTypes.isEmpty}}: Route
 
 {{/operation}}
 }