Skip to content

Commit a57588c

Browse files
fehguyfehguy
committed
Merge pull request #588 from wing328/csharp_response_warning
Eliminated warning related to response in CSharp API files
2 parents fad7246 + 660d336 commit a57588c

File tree

4 files changed

+1026
-967
lines changed

4 files changed

+1026
-967
lines changed

‎modules/swagger-codegen/src/main/resources/csharp/api.mustache‎

Lines changed: 93 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,113 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using {{invokerPackage}};
4-
using {{modelPackage}};
5-
{{#imports}}
6-
{{/imports}}
1+
using System;
2+
using System.Collections.Generic;
3+
using {{invokerPackage}};
4+
using {{modelPackage}};
5+
{{#imports}}
6+
{{/imports}}
77

8-
namespace {{package}} {
9-
{{#operations}}
10-
public class {{classname}} {
11-
string basePath;
12-
private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
8+
namespace {{package}} {
9+
{{#operations}}
10+
public class {{classname}} {
11+
string basePath;
12+
private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
1313
14-
public {{classname}}(String basePath = "{{basePath}}")
15-
{
16-
this.basePath = basePath;
17-
}
14+
public {{classname}}(String basePath = "{{basePath}}")
15+
{
16+
this.basePath = basePath;
17+
}
1818

19-
public ApiInvoker getInvoker() {
20-
return apiInvoker;
21-
}
19+
public ApiInvoker getInvoker() {
20+
return apiInvoker;
21+
}
2222

23-
// Sets the endpoint base url for the services being accessed
24-
public void setBasePath(string basePath) {
25-
this.basePath = basePath;
26-
}
23+
// Sets the endpoint base url for the services being accessed
24+
public void setBasePath(string basePath) {
25+
this.basePath = basePath;
26+
}
2727

28-
// Gets the endpoint base url for the services being accessed
29-
public String getBasePath() {
30-
return basePath;
31-
}
28+
// Gets the endpoint base url for the services being accessed
29+
public String getBasePath() {
30+
return basePath;
31+
}
3232

33-
{{#operation}}
33+
{{#operation}}
3434

35-
/// <summary>
36-
/// {{summary}} {{notes}}
37-
/// </summary>
38-
{{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
39-
{{#hasMore}} {{/hasMore}}{{/allParams}}
40-
/// <returns></returns>
41-
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
42-
// create path and map variables
43-
var path = "{{path}}".Replace("{format}","json"){{#pathParams}}.Replace("{" + "{{baseName}}" + "}", apiInvoker.escapeString({{{paramName}}}.ToString())){{/pathParams}};
35+
/// <summary>
36+
/// {{summary}} {{notes}}
37+
/// </summary>
38+
{{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
39+
{{#hasMore}} {{/hasMore}}{{/allParams}}
40+
/// <returns></returns>
41+
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
42+
// create path and map variables
43+
var path = "{{path}}".Replace("{format}","json"){{#pathParams}}.Replace("{" + "{{baseName}}" + "}", apiInvoker.escapeString({{{paramName}}}.ToString())){{/pathParams}};
4444

45-
// query params
46-
var queryParams = new Dictionary<String, String>();
47-
var headerParams = new Dictionary<String, String>();
48-
var formParams = new Dictionary<String, object>();
45+
// query params
46+
var queryParams = new Dictionary<String, String>();
47+
var headerParams = new Dictionary<String, String>();
48+
var formParams = new Dictionary<String, object>();
4949

50-
{{#requiredParamCount}}
51-
// verify required params are set
52-
if ({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
53-
throw new ApiException(400, "missing required params");
54-
}
55-
{{/requiredParamCount}}
50+
{{#requiredParamCount}}
51+
// verify required params are set
52+
if ({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
53+
throw new ApiException(400, "missing required params");
54+
}
55+
{{/requiredParamCount}}
5656

57-
{{#queryParams}}if ({{paramName}} != null){
58-
string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
59-
queryParams.Add("{{baseName}}", paramStr);
60-
}
61-
{{/queryParams}}
57+
{{#queryParams}}if ({{paramName}} != null){
58+
string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
59+
queryParams.Add("{{baseName}}", paramStr);
60+
}
61+
{{/queryParams}}
6262

63-
{{#headerParams}}headerParams.Add("{{baseName}}", {{paramName}});
64-
{{/headerParams}}
63+
{{#headerParams}}headerParams.Add("{{baseName}}", {{paramName}});
64+
{{/headerParams}}
6565

66-
{{#formParams}}if ({{paramName}} != null){
67-
if({{paramName}} is byte[]) {
68-
formParams.Add("{{baseName}}", {{paramName}});
69-
} else {
70-
string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
71-
formParams.Add("{{baseName}}", paramStr);
72-
}
73-
}
74-
{{/formParams}}
66+
{{#formParams}}if ({{paramName}} != null){
67+
if({{paramName}} is byte[]) {
68+
formParams.Add("{{baseName}}", {{paramName}});
69+
} else {
70+
string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
71+
formParams.Add("{{baseName}}", paramStr);
72+
}
73+
}
74+
{{/formParams}}
7575

76-
try {
77-
if (typeof({{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}) == typeof(byte[])) {
78-
var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
79-
return {{#returnType}}((object)response) as {{{returnType}}}{{/returnType}};
80-
} else {
81-
var response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
82-
if(response != null){
83-
return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(response, typeof({{{returnType}}})){{/returnType}};
84-
}
85-
else {
86-
return {{#returnType}}null{{/returnType}};
87-
}
88-
}
89-
} catch (ApiException ex) {
90-
if(ex.ErrorCode == 404) {
91-
return {{#returnType}}null{{/returnType}};
76+
try {
77+
if (typeof({{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}) == typeof(byte[])) {
78+
{{#returnType}}
79+
var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
80+
return ((object)response) as {{{returnType}}};
81+
{{/returnType}}
82+
{{^returnType}}
83+
apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
84+
return;
85+
{{/returnType}}
86+
} else {
87+
{{#returnType}}
88+
var response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
89+
if (response != null){
90+
return ({{{returnType}}}) ApiInvoker.deserialize(response, typeof({{{returnType}}}));
9291
}
9392
else {
94-
throw ex;
93+
return null;
9594
}
95+
{{/returnType}}
96+
{{^returnType}}
97+
apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
98+
return;
99+
{{/returnType}}
100+
}
101+
} catch (ApiException ex) {
102+
if(ex.ErrorCode == 404) {
103+
return {{#returnType}}null{{/returnType}};
104+
}
105+
else {
106+
throw ex;
96107
}
97108
}
98-
{{/operation}}
99109
}
100-
{{/operations}}
110+
{{/operation}}
101111
}
112+
{{/operations}}
113+
}

0 commit comments

Comments
 (0)