fix null json payload in net47 (#7870)

modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache

@@ -99,6 +99,11 @@
         public static {{classname}} FromJson(string jsonString)
         {
             {{classname}} new{{classname}} = null;
+
+            if (jsonString == null)
+            {
+                return new{{classname}};
+            }
             {{#anyOf}}
 
             try

modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache

@@ -99,6 +99,11 @@
         public static {{classname}} FromJson(string jsonString)
         {
             {{classname}} new{{classname}} = null;
+
+            if (jsonString == null)
+            {
+                return new{{classname}};
+            }
             {{#useOneOfDiscriminatorLookup}}
             {{#discriminator}}
 

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         public static Fruit FromJson(string jsonString)
         {
             Fruit newFruit = null;
+
+            if (jsonString == null)
+            {
+                return newFruit;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs

@@ -146,6 +146,11 @@ namespace Org.OpenAPITools.Model
         public static FruitReq FromJson(string jsonString)
         {
             FruitReq newFruitReq = null;
+
+            if (jsonString == null)
+            {
+                return newFruitReq;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         {
             GmFruit newGmFruit = null;
 
+            if (jsonString == null)
+            {
+                return newGmFruit;
+            }
+
             try
             {
                 newGmFruit = new GmFruit(JsonConvert.DeserializeObject<Apple>(jsonString, GmFruit.SerializerSettings));

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs

@@ -165,6 +165,11 @@ namespace Org.OpenAPITools.Model
         {
             Mammal newMammal = null;
 
+            if (jsonString == null)
+            {
+                return newMammal;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs

@@ -148,6 +148,11 @@ namespace Org.OpenAPITools.Model
         {
             NullableShape newNullableShape = null;
 
+            if (jsonString == null)
+            {
+                return newNullableShape;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Pig newPig = null;
 
+            if (jsonString == null)
+            {
+                return newPig;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Quadrilateral newQuadrilateral = null;
 
+            if (jsonString == null)
+            {
+                return newQuadrilateral;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Shape newShape = null;
 
+            if (jsonString == null)
+            {
+                return newShape;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs

@@ -148,6 +148,11 @@ namespace Org.OpenAPITools.Model
         {
             ShapeOrNull newShapeOrNull = null;
 
+            if (jsonString == null)
+            {
+                return newShapeOrNull;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs

@@ -165,6 +165,11 @@ namespace Org.OpenAPITools.Model
         {
             Triangle newTriangle = null;
 
+            if (jsonString == null)
+            {
+                return newTriangle;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         public static Fruit FromJson(string jsonString)
         {
             Fruit newFruit = null;
+
+            if (jsonString == null)
+            {
+                return newFruit;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs

@@ -146,6 +146,11 @@ namespace Org.OpenAPITools.Model
         public static FruitReq FromJson(string jsonString)
         {
             FruitReq newFruitReq = null;
+
+            if (jsonString == null)
+            {
+                return newFruitReq;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         {
             GmFruit newGmFruit = null;
 
+            if (jsonString == null)
+            {
+                return newGmFruit;
+            }
+
             try
             {
                 newGmFruit = new GmFruit(JsonConvert.DeserializeObject<Apple>(jsonString, GmFruit.SerializerSettings));

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs

@@ -165,6 +165,11 @@ namespace Org.OpenAPITools.Model
         {
             Mammal newMammal = null;
 
+            if (jsonString == null)
+            {
+                return newMammal;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs

@@ -148,6 +148,11 @@ namespace Org.OpenAPITools.Model
         {
             NullableShape newNullableShape = null;
 
+            if (jsonString == null)
+            {
+                return newNullableShape;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Pig newPig = null;
 
+            if (jsonString == null)
+            {
+                return newPig;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Quadrilateral newQuadrilateral = null;
 
+            if (jsonString == null)
+            {
+                return newQuadrilateral;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs

@@ -139,6 +139,11 @@ namespace Org.OpenAPITools.Model
         {
             Shape newShape = null;
 
+            if (jsonString == null)
+            {
+                return newShape;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs

@@ -148,6 +148,11 @@ namespace Org.OpenAPITools.Model
         {
             ShapeOrNull newShapeOrNull = null;
 
+            if (jsonString == null)
+            {
+                return newShapeOrNull;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs

@@ -165,6 +165,11 @@ namespace Org.OpenAPITools.Model
         {
             Triangle newTriangle = null;
 
+            if (jsonString == null)
+            {
+                return newTriangle;
+            }
+
             string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
             switch (discriminatorValue)
             {

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         public static Fruit FromJson(string jsonString)
         {
             Fruit newFruit = null;
+
+            if (jsonString == null)
+            {
+                return newFruit;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs

@@ -146,6 +146,11 @@ namespace Org.OpenAPITools.Model
         public static FruitReq FromJson(string jsonString)
         {
             FruitReq newFruitReq = null;
+
+            if (jsonString == null)
+            {
+                return newFruitReq;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs

@@ -137,6 +137,11 @@ namespace Org.OpenAPITools.Model
         {
             GmFruit newGmFruit = null;
 
+            if (jsonString == null)
+            {
+                return newGmFruit;
+            }
+
             try
             {
                 newGmFruit = new GmFruit(JsonConvert.DeserializeObject<Apple>(jsonString, GmFruit.SerializerSettings));

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs

@@ -164,6 +164,11 @@ namespace Org.OpenAPITools.Model
         public static Mammal FromJson(string jsonString)
         {
             Mammal newMammal = null;
+
+            if (jsonString == null)
+            {
+                return newMammal;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs

@@ -147,6 +147,11 @@ namespace Org.OpenAPITools.Model
         public static NullableShape FromJson(string jsonString)
         {
             NullableShape newNullableShape = null;
+
+            if (jsonString == null)
+            {
+                return newNullableShape;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs

@@ -138,6 +138,11 @@ namespace Org.OpenAPITools.Model
         public static Pig FromJson(string jsonString)
         {
             Pig newPig = null;
+
+            if (jsonString == null)
+            {
+                return newPig;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs

@@ -138,6 +138,11 @@ namespace Org.OpenAPITools.Model
         public static Quadrilateral FromJson(string jsonString)
         {
             Quadrilateral newQuadrilateral = null;
+
+            if (jsonString == null)
+            {
+                return newQuadrilateral;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs

@@ -138,6 +138,11 @@ namespace Org.OpenAPITools.Model
         public static Shape FromJson(string jsonString)
         {
             Shape newShape = null;
+
+            if (jsonString == null)
+            {
+                return newShape;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs

@@ -147,6 +147,11 @@ namespace Org.OpenAPITools.Model
         public static ShapeOrNull FromJson(string jsonString)
         {
             ShapeOrNull newShapeOrNull = null;
+
+            if (jsonString == null)
+            {
+                return newShapeOrNull;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();
 

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs

@@ -164,6 +164,11 @@ namespace Org.OpenAPITools.Model
         public static Triangle FromJson(string jsonString)
         {
             Triangle newTriangle = null;
+
+            if (jsonString == null)
+            {
+                return newTriangle;
+            }
             int match = 0;
             List<string> matchedTypes = new List<string>();