Merge pull request #385 from etherealjoy/fix_new_keyword_collection

JFCote · web-flow · commit 9990ddbe5217 · 2018-06-27T08:07:38.000-04:00
[aspnetcore] Fix new keyword collection
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -58,7 +58,7 @@ public class CodegenModel {
     public Set<String> allMandatory;
 
     public Set<String> imports = new TreeSet<String>();
-    public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, hasOptional, isArrayModel, hasChildren;
+    public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, hasOptional, isArrayModel, hasChildren, isMapModel;
     public boolean hasOnlyReadOnly = true; // true if all properties are read-only
     public ExternalDocumentation externalDocumentation;
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -218,7 +218,7 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
                     }
                     parent.getChildren().add(cm);
                     if (parent.getDiscriminator() == null) {
-                        parent = allModels.get(parent.parent);
+                        parent = allModels.get(parent.getParent());
                     } else {
                         parent = null;
                     }
@@ -1521,6 +1521,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
             }
             if (ModelUtils.isMapSchema(schema)) {
                 addAdditionPropertiesToCodeGenModel(m, schema);
+                m.isMapModel = true;
             }
             addVars(m, schema.getProperties(), schema.getRequired());
         }
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/model.mustache
@@ -56,7 +56,7 @@ namespace {{packageName}}.Models
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}} new {{/parent}}string ToJson()
+        public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -68,7 +68,7 @@ namespace {{packageName}}.Models
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals(({{classname}})obj);
         }
@@ -80,7 +80,7 @@ namespace {{packageName}}.Models
         /// <returns>Boolean</returns>
         public bool Equals({{classname}} other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return {{#vars}}{{#isNotContainer}}
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs
@@ -73,7 +73,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((ApiResponse)obj);
         }
@@ -85,7 +85,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(ApiResponse other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs
@@ -66,7 +66,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((Category)obj);
         }
@@ -78,7 +78,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(Category other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
@@ -122,7 +122,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((Order)obj);
         }
@@ -134,7 +134,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(Order other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
@@ -124,7 +124,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((Pet)obj);
         }
@@ -136,7 +136,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(Pet other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs
@@ -66,7 +66,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((Tag)obj);
         }
@@ -78,7 +78,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(Tag other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs
@@ -109,7 +109,7 @@ public string ToJson()
         /// <returns>Boolean</returns>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((User)obj);
         }
@@ -121,7 +121,7 @@ public override bool Equals(object obj)
         /// <returns>Boolean</returns>
         public bool Equals(User other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return 

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {`
`218`	`218`	`}`
`219`	`219`	`parent.getChildren().add(cm);`
`220`	`220`	`if (parent.getDiscriminator() == null) {`
`221`		`- parent = allModels.get(parent.parent);`
	`221`	`+ parent = allModels.get(parent.getParent());`
`222`	`222`	`} else {`
`223`	`223`	`parent = null;`
`224`	`224`	`}`
`@@ -1521,6 +1521,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al`
`1521`	`1521`	`}`
`1522`	`1522`	`if (ModelUtils.isMapSchema(schema)) {`
`1523`	`1523`	`addAdditionPropertiesToCodeGenModel(m, schema);`
	`1524`	`+ m.isMapModel = true;`
`1524`	`1525`	`}`
`1525`	`1526`	`addVars(m, schema.getProperties(), schema.getRequired());`
`1526`	`1527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace {{packageName}}.Models`
`56`	`56`	`/// Returns the JSON string presentation of the object`
`57`	`57`	`/// </summary>`
`58`	`58`	`/// <returns>JSON string presentation of the object</returns>`
`59`		`- public {{#parent}} new {{/parent}}string ToJson()`
	`59`	`+ public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson()`
`60`	`60`	`{`
`61`	`61`	`return JsonConvert.SerializeObject(this, Formatting.Indented);`
`62`	`62`	`}`
`@@ -68,7 +68,7 @@ namespace {{packageName}}.Models`
`68`	`68`	`/// <returns>Boolean</returns>`
`69`	`69`	`public override bool Equals(object obj)`
`70`	`70`	`{`
`71`		`- if (ReferenceEquals(null, obj)) return false;`
	`71`	`+ if (obj is null) return false;`
`72`	`72`	`if (ReferenceEquals(this, obj)) return true;`
`73`	`73`	`return obj.GetType() == GetType() && Equals(({{classname}})obj);`
`74`	`74`	`}`
`@@ -80,7 +80,7 @@ namespace {{packageName}}.Models`
`80`	`80`	`/// <returns>Boolean</returns>`
`81`	`81`	`public bool Equals({{classname}} other)`
`82`	`82`	`{`
`83`		`- if (ReferenceEquals(null, other)) return false;`
	`83`	`+ if (other is null) return false;`
`84`	`84`	`if (ReferenceEquals(this, other)) return true;`
`85`	`85`
`86`	`86`	`return {{#vars}}{{#isNotContainer}}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public string ToJson()`
`73`	`73`	`/// <returns>Boolean</returns>`
`74`	`74`	`public override bool Equals(object obj)`
`75`	`75`	`{`
`76`		`- if (ReferenceEquals(null, obj)) return false;`
	`76`	`+ if (obj is null) return false;`
`77`	`77`	`if (ReferenceEquals(this, obj)) return true;`
`78`	`78`	`return obj.GetType() == GetType() && Equals((ApiResponse)obj);`
`79`	`79`	`}`
`@@ -85,7 +85,7 @@ public override bool Equals(object obj)`
`85`	`85`	`/// <returns>Boolean</returns>`
`86`	`86`	`public bool Equals(ApiResponse other)`
`87`	`87`	`{`
`88`		`- if (ReferenceEquals(null, other)) return false;`
	`88`	`+ if (other is null) return false;`
`89`	`89`	`if (ReferenceEquals(this, other)) return true;`
`90`	`90`
`91`	`91`	`return`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public string ToJson()`
`66`	`66`	`/// <returns>Boolean</returns>`
`67`	`67`	`public override bool Equals(object obj)`
`68`	`68`	`{`
`69`		`- if (ReferenceEquals(null, obj)) return false;`
	`69`	`+ if (obj is null) return false;`
`70`	`70`	`if (ReferenceEquals(this, obj)) return true;`
`71`	`71`	`return obj.GetType() == GetType() && Equals((Category)obj);`
`72`	`72`	`}`
`@@ -78,7 +78,7 @@ public override bool Equals(object obj)`
`78`	`78`	`/// <returns>Boolean</returns>`
`79`	`79`	`public bool Equals(Category other)`
`80`	`80`	`{`
`81`		`- if (ReferenceEquals(null, other)) return false;`
	`81`	`+ if (other is null) return false;`
`82`	`82`	`if (ReferenceEquals(this, other)) return true;`
`83`	`83`
`84`	`84`	`return`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public string ToJson()`
`122`	`122`	`/// <returns>Boolean</returns>`
`123`	`123`	`public override bool Equals(object obj)`
`124`	`124`	`{`
`125`		`- if (ReferenceEquals(null, obj)) return false;`
	`125`	`+ if (obj is null) return false;`
`126`	`126`	`if (ReferenceEquals(this, obj)) return true;`
`127`	`127`	`return obj.GetType() == GetType() && Equals((Order)obj);`
`128`	`128`	`}`
`@@ -134,7 +134,7 @@ public override bool Equals(object obj)`
`134`	`134`	`/// <returns>Boolean</returns>`
`135`	`135`	`public bool Equals(Order other)`
`136`	`136`	`{`
`137`		`- if (ReferenceEquals(null, other)) return false;`
	`137`	`+ if (other is null) return false;`
`138`	`138`	`if (ReferenceEquals(this, other)) return true;`
`139`	`139`
`140`	`140`	`return`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public string ToJson()`
`124`	`124`	`/// <returns>Boolean</returns>`
`125`	`125`	`public override bool Equals(object obj)`
`126`	`126`	`{`
`127`		`- if (ReferenceEquals(null, obj)) return false;`
	`127`	`+ if (obj is null) return false;`
`128`	`128`	`if (ReferenceEquals(this, obj)) return true;`
`129`	`129`	`return obj.GetType() == GetType() && Equals((Pet)obj);`
`130`	`130`	`}`
`@@ -136,7 +136,7 @@ public override bool Equals(object obj)`
`136`	`136`	`/// <returns>Boolean</returns>`
`137`	`137`	`public bool Equals(Pet other)`
`138`	`138`	`{`
`139`		`- if (ReferenceEquals(null, other)) return false;`
	`139`	`+ if (other is null) return false;`
`140`	`140`	`if (ReferenceEquals(this, other)) return true;`
`141`	`141`
`142`	`142`	`return`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public string ToJson()`
`109`	`109`	`/// <returns>Boolean</returns>`
`110`	`110`	`public override bool Equals(object obj)`
`111`	`111`	`{`
`112`		`- if (ReferenceEquals(null, obj)) return false;`
	`112`	`+ if (obj is null) return false;`
`113`	`113`	`if (ReferenceEquals(this, obj)) return true;`
`114`	`114`	`return obj.GetType() == GetType() && Equals((User)obj);`
`115`	`115`	`}`
`@@ -121,7 +121,7 @@ public override bool Equals(object obj)`
`121`	`121`	`/// <returns>Boolean</returns>`
`122`	`122`	`public bool Equals(User other)`
`123`	`123`	`{`
`124`		`- if (ReferenceEquals(null, other)) return false;`
	`124`	`+ if (other is null) return false;`
`125`	`125`	`if (ReferenceEquals(this, other)) return true;`
`126`	`126`
`127`	`127`	`return`