diff --git a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
index 6ff66a84720..2607e89289b 100644
--- a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
@@ -32,12 +32,12 @@ class {{classname}} {
     def queryParams = [:]
     def headerParams = [:]
 
-    {{#requiredParamCount}}
+    {{#allParams}}
     // verify required params are set
-    if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+    if({{/allParams}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#allParams}}) {
        throw new RuntimeException("missing required params")
     }
-    {{/requiredParamCount}}
+    {{/allParams}}
 
     {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
       queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
index dfec3d789dd..10aa6c7b757 100644
--- a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
@@ -21,9 +21,9 @@ class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiC
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    {{#requiredParamCount}}// verify required params are set
-    val paramCount = (Set[Any]({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) - null).size
-    if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/requiredParamCount}}
+    {{#allParams}}// verify required params are set
+    val paramCount = (Set[Any]({{/allParams}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#allParams}}) - null).size
+    if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/allParams}}
 
     {{#queryParams}}{{^required}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/required}}{{#required}}
     if({{paramName}} != null)   queryParams += "{{baseName}}" -> {{paramName}}.toString{{/required}}{{/queryParams}}
diff --git a/modules/swagger-codegen/src/main/resources/dart/api.mustache b/modules/swagger-codegen/src/main/resources/dart/api.mustache
index 51216a11c95..6d8619639e5 100644
--- a/modules/swagger-codegen/src/main/resources/dart/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/dart/api.mustache
@@ -18,11 +18,11 @@ class {{classname}} {
   /// {{notes}}
   {{#returnType}}Future<{{{returnType}}}> {{/returnType}}{{^returnType}}Future {{/returnType}}{{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#requiredParamCount}}
+    {{#allParams}}
     // verify required params are set
-    if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+    if({{/allParams}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#allParams}}) {
        throw new ApiException(400, "missing required params");
-    }{{/requiredParamCount}}
+    }{{/allParams}}
 
     // create path and map variables
     String path = "{{path}}".replaceAll("{format}","json"){{#pathParams}}.replaceAll("{" + "{{paramName}}" + "}", {{{paramName}}}.toString()){{/pathParams}};
diff --git a/modules/swagger-codegen/src/main/resources/flash/api.mustache b/modules/swagger-codegen/src/main/resources/flash/api.mustache
index 2f5ccfe0dbb..ecb68d827e3 100644
--- a/modules/swagger-codegen/src/main/resources/flash/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/flash/api.mustache
@@ -42,12 +42,12 @@ public class {{classname}} extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        {{#requiredParamCount}}
+        {{#allParams}}
         // verify required params are set
-        if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+        if({{/allParams}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#allParams}}) {
             throw new ApiError(400, "missing required params");
         }
-        {{/requiredParamCount}}
+        {{/allParams}}
 
         {{#queryParams}}if("null" != String({{paramName}}))
             queryParams["{{paramName}}"] = toPathValue({{paramName}});
diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache
index 41b58374dea..2643c2e9632 100644
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -44,13 +44,13 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    {{#requiredParamCount}}
+    {{#allParams}}
     // verify required params are set
-    (List({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}).filter(_ != null)).size match {
+    (List({{/allParams}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#allParams}}).filter(_ != null)).size match {
        case {{requiredParamCount}} => // all required values set
        case _ => throw new Exception("missing required params")
     }
-    {{/requiredParamCount}}
+    {{/allParams}}
 
     {{#queryParams}}if(String.valueOf({{paramName}}) != "null") queryParams += "{{baseName}}" -> {{paramName}}.toString
     {{/queryParams}}