From 92a0e4e7d878c832005c52f7016cdf99b2ddc393 Mon Sep 17 00:00:00 2001
From: sunn <sunn.ssb@live.com>
Date: Sun, 24 Jun 2018 00:28:53 +0200
Subject: [PATCH] Remove 'new' keyword from collection

---
 .../main/java/org/openapitools/codegen/CodegenModel.java    | 2 +-
 .../main/java/org/openapitools/codegen/DefaultCodegen.java  | 4 +++-
 .../src/main/resources/aspnetcore/model.mustache            | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

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
index 7796f80027f..62c46dd612f 100644
--- 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, isCollectionModel;
     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
index 2a5a3b7f43e..1c431a6c8f1 100644
--- 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 class DefaultCodegen implements CodegenConfig {
                     }
                     parent.getChildren().add(cm);
                     if (parent.getDiscriminator() == null) {
-                        parent = allModels.get(parent.parent);
+                        parent = allModels.get(parent.getParent());
                     } else {
                         parent = null;
                     }
@@ -1412,6 +1412,7 @@ public class DefaultCodegen implements CodegenConfig {
 
         if (ModelUtils.isArraySchema(schema)) {
             m.isArrayModel = true;
+            m.isCollectionModel = true;
             m.arrayModelType = fromProperty(name, schema).complexType;
             addParentContainer(m, name, schema);
         } else if (schema instanceof ComposedSchema) {
@@ -1521,6 +1522,7 @@ public class DefaultCodegen implements CodegenConfig {
             }
             if (ModelUtils.isMapSchema(schema)) {
                 addAdditionPropertiesToCodeGenModel(m, schema);
+                m.isCollectionModel = 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
index bae41a3e3bc..3307a41dd7d 100644
--- 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}}{{^isCollectionModel}}new {{/isCollectionModel}}{{/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}}