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

[C#][netcore] Call static method without creating instance (#8889)

Browse Source 
* call static method without creating instance

* fix instance

* fix missing equal sign

* skip instance creation

* cast to T

* update httpclient apiclient.mustache
This commit is contained in:
William Cheng 2021-03-07 17:45:14 +08:00 committed by GitHub
parent 041d908963
commit 51a19e1c27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,10 +482,7 @@ namespace {{packageName}}.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {
@ -602,10 +599,7 @@ namespace {{packageName}}.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -453,10 +453,7 @@ namespace {{packageName}}.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T) Activator.CreateInstance(typeof(T)); responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] {response.Content});
responseData = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -431,10 +431,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T) Activator.CreateInstance(typeof(T)); responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] {response.Content});
responseData = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -482,10 +482,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {
@ -597,10 +594,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -482,10 +482,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {
@ -597,10 +594,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -481,10 +481,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {
@ -596,10 +593,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {

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

@ -482,10 +482,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {
@ -597,10 +594,7 @@ namespace Org.OpenAPITools.Client
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
{ {
T instance = (T)Activator.CreateInstance(typeof(T)); response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
MethodInfo method = typeof(T).GetMethod("FromJson");
method.Invoke(instance, new object[] { response.Content });
response.Data = instance;
} }
else if (typeof(T).Name == "Stream") // for binary response else if (typeof(T).Name == "Stream") // for binary response
{ {