[csharp-netcore]Fixed the null serialization issue for dotnet47 (#7884)

Ghufz · web-flow · commit 05515040d54d · 2020-11-06T16:15:38.000+08:00
* Fixed the null serialization issue for dotnet47

* c# codeing style

* Updated the sample for csharp netcore

* corrected the typos
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache
@@ -208,7 +208,11 @@
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache
@@ -237,7 +237,11 @@
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs
@@ -254,7 +254,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -263,7 +263,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs
@@ -242,7 +242,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs
@@ -311,7 +311,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -279,7 +279,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -279,7 +279,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return ShapeOrNull.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return ShapeOrNull.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs
@@ -311,7 +311,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Triangle.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Triangle.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs
@@ -254,7 +254,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -263,7 +263,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs
@@ -242,7 +242,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs
@@ -311,7 +311,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -279,7 +279,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs
@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -279,7 +279,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return ShapeOrNull.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return ShapeOrNull.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs
@@ -311,7 +311,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Triangle.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Triangle.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs
@@ -254,7 +254,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -263,7 +263,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs
@@ -242,7 +242,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs
@@ -293,7 +293,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -264,7 +264,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs
@@ -255,7 +255,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -255,7 +255,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs
@@ -255,7 +255,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         /// <returns>The object converted from the JSON string</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            if(reader.TokenType != JsonToken.Null)
+            {
+                return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None));
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,11 @@`
`208`	`208`	`/// <returns>The object converted from the JSON string</returns>`
`209`	`209`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`210`	`210`	`{`
`211`		`- return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`211`	`+ if(reader.TokenType != JsonToken.Null)`
	`212`	`+ {`
	`213`	`+ return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`214`	`+ }`
	`215`	`+ return null;`
`212`	`216`	`}`
`213`	`217`
`214`	`218`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,11 @@`
`237`	`237`	`/// <returns>The object converted from the JSON string</returns>`
`238`	`238`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`239`	`239`	`{`
`240`		`- return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`240`	`+ if(reader.TokenType != JsonToken.Null)`
	`241`	`+ {`
	`242`	`+ return {{classname}}.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`243`	`+ }`
	`244`	`+ return null;`
`241`	`245`	`}`
`242`	`246`
`243`	`247`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`254`	`254`	`/// <returns>The object converted from the JSON string</returns>`
`255`	`255`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`256`	`256`	`{`
`257`		`- return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`257`	`+ if(reader.TokenType != JsonToken.Null)`
	`258`	`+ {`
	`259`	`+ return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`260`	`+ }`
	`261`	`+ return null;`
`258`	`262`	`}`
`259`	`263`
`260`	`264`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`263`	`263`	`/// <returns>The object converted from the JSON string</returns>`
`264`	`264`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`265`	`265`	`{`
`266`		`- return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`266`	`+ if(reader.TokenType != JsonToken.Null)`
	`267`	`+ {`
	`268`	`+ return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`269`	`+ }`
	`270`	`+ return null;`
`267`	`271`	`}`
`268`	`272`
`269`	`273`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`242`	`242`	`/// <returns>The object converted from the JSON string</returns>`
`243`	`243`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`244`	`244`	`{`
`245`		`- return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`245`	`+ if(reader.TokenType != JsonToken.Null)`
	`246`	`+ {`
	`247`	`+ return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`248`	`+ }`
	`249`	`+ return null;`
`246`	`250`	`}`
`247`	`251`
`248`	`252`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`311`	`311`	`/// <returns>The object converted from the JSON string</returns>`
`312`	`312`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`313`	`313`	`{`
`314`		`- return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`314`	`+ if(reader.TokenType != JsonToken.Null)`
	`315`	`+ {`
	`316`	`+ return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`317`	`+ }`
	`318`	`+ return null;`
`315`	`319`	`}`
`316`	`320`
`317`	`321`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`279`	`279`	`/// <returns>The object converted from the JSON string</returns>`
`280`	`280`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`281`	`281`	`{`
`282`		`- return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`282`	`+ if(reader.TokenType != JsonToken.Null)`
	`283`	`+ {`
	`284`	`+ return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`285`	`+ }`
	`286`	`+ return null;`
`283`	`287`	`}`
`284`	`288`
`285`	`289`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`270`	`270`	`/// <returns>The object converted from the JSON string</returns>`
`271`	`271`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`272`	`272`	`{`
`273`		`- return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`273`	`+ if(reader.TokenType != JsonToken.Null)`
	`274`	`+ {`
	`275`	`+ return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`276`	`+ }`
	`277`	`+ return null;`
`274`	`278`	`}`
`275`	`279`
`276`	`280`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`293`	`293`	`/// <returns>The object converted from the JSON string</returns>`
`294`	`294`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`295`	`295`	`{`
`296`		`- return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`296`	`+ if(reader.TokenType != JsonToken.Null)`
	`297`	`+ {`
	`298`	`+ return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`299`	`+ }`
	`300`	`+ return null;`
`297`	`301`	`}`
`298`	`302`
`299`	`303`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`264`	`264`	`/// <returns>The object converted from the JSON string</returns>`
`265`	`265`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`266`	`266`	`{`
`267`		`- return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`267`	`+ if(reader.TokenType != JsonToken.Null)`
	`268`	`+ {`
	`269`	`+ return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None));`
	`270`	`+ }`
	`271`	`+ return null;`
`268`	`272`	`}`
`269`	`273`
`270`	`274`	`/// <summary>`