From d9e024a7bf359d864638e7562aa47755f80c372a Mon Sep 17 00:00:00 2001
From: Johannes Fiala <johannes.fiala@fwd.at>
Date: Sun, 6 Dec 2015 12:06:23 +0100
Subject: [PATCH] Cleanup mandatoryParam variable in mustache and Codegen,
 replaced using -last

---
 .../src/main/java/io/swagger/codegen/CodegenModel.java         | 3 ---
 .../src/main/java/io/swagger/codegen/DefaultCodegen.java       | 3 +--
 .../src/main/resources/Javascript/model.mustache               | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
index d9aea7da624e..3e2ad6afb2cb 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
@@ -17,9 +17,6 @@ public class CodegenModel {
     // list of all required parameters
     public Set<String> mandatory = new HashSet<String>();
     
-    // TODO: temporary solution to get a delimited list of default constructor parameters, should be replaced if there is a better way of injecting the mandatory parameters into the mustache templates
-    public String mandatoryParams;
-    
     public Set<String> imports = new HashSet<String>();
     public Boolean hasVars, emptyVars, hasMoreModels, hasEnums;
     public ExternalDocs externalDocs;
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index e1292cbac952..d0af0316811c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1883,8 +1883,7 @@ public class DefaultCodegen {
             }
             
             m.mandatory = mandatory;
-            m.mandatoryParams = StringUtils.join(mandatory, ", ");
-
+            
         } else {
             m.emptyVars = true;
             m.hasVars = false;
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
index 792fde00b128..1c6ca9fe0ccd 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
@@ -4,7 +4,7 @@
 {{#description}}/**
  * {{description}}
  **/{{/description}}
-function {{classname}}({{mandatoryParams}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
+function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/-last}}{{/mandatory}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
   	var self = this;
   	{{#vars}}
   	/**{{#description}}