loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[csharp-netcore]Model's FromJson method check for jsonstring is not nullOrEmpty before deserializing (#10060)

Browse Source 
* check for jsonstring is not nullOrEmpty before desrializing for oneOf and anyOf

* update samples

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Ghufran Zahidi
2021-08-02 09:05:00 +05:30
committed by GitHub
parent fc28661dde
commit e5ce66aae6
62 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache vendored
View File

@@ -100,7 +100,7 @@
{
{{classname}} new{{classname}} = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return new{{classname}};
}

2
modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache vendored
View File

@@ -100,7 +100,7 @@
{
{{classname}} new{{classname}} = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return new{{classname}};
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs
View File

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs
View File

@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs
View File

@@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs
View File

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs
View File

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs
View File

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs
View File

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs
View File

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs
View File

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs
View File

@@ -166,7 +166,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs
View File

@@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs
View File

@@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs
View File

@@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs
View File

@@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
View File

@@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs
View File

@@ -166,7 +166,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}

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

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

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

@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

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

@@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs
View File

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs
View File

@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs
View File

@@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs
View File

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs
View File

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs
View File

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs
View File

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs
View File

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}

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

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

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

@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

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

@@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}

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

@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model
{
Fruit newFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruit;
}

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

@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
{
FruitReq newFruitReq = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newFruitReq;
}

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

@@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model
{
GmFruit newGmFruit = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newGmFruit;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Mammal newMammal = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newMammal;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
NullableShape newNullableShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newNullableShape;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Pig newPig = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newPig;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Quadrilateral newQuadrilateral = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newQuadrilateral;
}

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

@@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model
{
Shape newShape = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShape;
}

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

@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
{
ShapeOrNull newShapeOrNull = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newShapeOrNull;
}

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

@@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model
{
Triangle newTriangle = null;
if (jsonString == null)
if (string.IsNullOrEmpty(jsonString))
{
return newTriangle;
}