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

[chsarp-netcore]handle the exception to get correct error message. (#10207)

Browse Source 
* handle the exception to get meaningful message.

* minor code format enhancement, update samples

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Ghufran Zahidi 2021-08-21 22:54:24 +05:30 committed by GitHub
parent 4e3a98cee4
commit a71258d7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 769 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache vendored
View File

@ -494,9 +494,16 @@ namespace {{packageName}}.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

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

@ -107,7 +107,10 @@
{{#useOneOfDiscriminatorLookup}}
{{#discriminator}}
string discriminatorValue = JObject.Parse(jsonString)["{{{propertyBaseName}}}"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["{{{propertyBaseName}}}"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
{{#mappedModels}}
@ -119,6 +122,11 @@
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
{{/discriminator}}
{{/useOneOfDiscriminatorLookup}}

7
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -493,9 +493,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newMammal;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Pig":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newNullableShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newPig;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "BasquePig":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newQuadrilateral;
}
string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["quadrilateralType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "ComplexQuadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newShapeOrNull;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newTriangle;
}
string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["triangleType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "EquilateralTriangle":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -171,7 +171,10 @@ namespace Org.OpenAPITools.Model
return newMammal;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Pig":
@ -187,6 +190,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -154,7 +154,10 @@ namespace Org.OpenAPITools.Model
return newNullableShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -167,6 +170,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -145,7 +145,10 @@ namespace Org.OpenAPITools.Model
return newPig;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "BasquePig":
@ -158,6 +161,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -145,7 +145,10 @@ namespace Org.OpenAPITools.Model
return newQuadrilateral;
}
string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["quadrilateralType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "ComplexQuadrilateral":
@ -158,6 +161,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -145,7 +145,10 @@ namespace Org.OpenAPITools.Model
return newShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -158,6 +161,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -154,7 +154,10 @@ namespace Org.OpenAPITools.Model
return newShapeOrNull;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -167,6 +170,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -171,7 +171,10 @@ namespace Org.OpenAPITools.Model
return newTriangle;
}
string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["triangleType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "EquilateralTriangle":
@ -187,6 +190,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

7
samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -494,9 +494,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newMammal;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Pig":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newNullableShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newPig;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "BasquePig":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newQuadrilateral;
}
string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["quadrilateralType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "ComplexQuadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newShapeOrNull;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newTriangle;
}
string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["triangleType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "EquilateralTriangle":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

7
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -494,9 +494,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newMammal;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Pig":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newNullableShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newPig;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "BasquePig":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newQuadrilateral;
}
string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["quadrilateralType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "ComplexQuadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newShapeOrNull;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newTriangle;
}
string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["triangleType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "EquilateralTriangle":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

7
samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -493,9 +493,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newMammal;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Pig":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newNullableShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newPig;
}
string discriminatorValue = JObject.Parse(jsonString)["className"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["className"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "BasquePig":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newQuadrilateral;
}
string discriminatorValue = JObject.Parse(jsonString)["quadrilateralType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["quadrilateralType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "ComplexQuadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -144,7 +144,10 @@ namespace Org.OpenAPITools.Model
return newShape;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -157,6 +160,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -153,7 +153,10 @@ namespace Org.OpenAPITools.Model
return newShapeOrNull;
}
string discriminatorValue = JObject.Parse(jsonString)["shapeType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["shapeType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "Quadrilateral":
@ -166,6 +169,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

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

@ -170,7 +170,10 @@ namespace Org.OpenAPITools.Model
return newTriangle;
}
string discriminatorValue = JObject.Parse(jsonString)["triangleType"].ToString();
try
{
var discriminatorObj = JObject.Parse(jsonString)["triangleType"];
string discriminatorValue = discriminatorObj == null ?string.Empty :discriminatorObj.ToString();
switch (discriminatorValue)
{
case "EquilateralTriangle":
@ -186,6 +189,11 @@ namespace Org.OpenAPITools.Model
System.Diagnostics.Debug.WriteLine(string.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
break;
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(string.Format("Failed to parse the json data : `{0}` {1}", jsonString, ex.ToString()));
}
int match = 0;
List<string> matchedTypes = new List<string>();

7
samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -494,9 +494,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);

7
samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -493,9 +493,16 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{
try
{
response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
}
catch (Exception ex)
{
throw ex.InnerException != null ? ex.InnerException : ex;
}
}
else if (typeof(T).Name == "Stream") // for binary response
{
response.Data = (T)(object)new MemoryStream(response.RawBytes);