refactor csharp (no compile error)

Author: wing328

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

@@ -10,12 +10,12 @@ namespace {{package}} {
   {{#operations}}
   public class {{classname}} {
     string basePath;
-    protected RestClient restClient;
+    public ApiInvoker apiClient {get; set;}
 
     public {{classname}}(String basePath = "{{basePath}}")
     {
       this.basePath = basePath;
-      this.restClient = new RestClient(basePath);
+      this.apiClient = new ApiInvoker(basePath);
     }
 
     /// <summary>
@@ -45,37 +45,38 @@ namespace {{package}} {
     /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
     public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
 
-      var _request = new RestRequest("{{path}}", Method.{{httpMethod}});
-
       {{#allParams}}{{#required}}
       // verify the required parameter '{{paramName}}' is set
       if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
       {{/required}}{{/allParams}}
 
-      // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
-      {
-        _request.AddHeader(defaultHeader.Key, defaultHeader.Value);
-      }
-
-      _request.AddUrlSegment("format", "json"); // set format to json by default
-      {{#pathParams}}_request.AddUrlSegment("{{baseName}}", ApiInvoker.ParameterToString({{{paramName}}})); // path (url segment) parameter
+      var path = "{{path}}";
+      path = path.Replace("{format}", "json");
+      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
       {{/pathParams}}
-      {{#queryParams}} if ({{paramName}} != null) _request.AddParameter("{{baseName}}", ApiInvoker.ParameterToString({{paramName}})); // query parameter
+
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, String>();
+      var fileParams = new Dictionary<String, String>();
+      String postBody = null;
+
+      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
       {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) _request.AddHeader("{{baseName}}", ApiInvoker.ParameterToString({{paramName}})); // header parameter
+      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
       {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}_request.AddFile("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}_request.AddParameter("{{baseName}}", ApiInvoker.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
       {{/formParams}}
-      {{#bodyParam}}_request.AddParameter("application/json", ApiInvoker.Serialize({{paramName}}), ParameterType.RequestBody); // http body (model) parameter
+      {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter
       {{/bodyParam}}
 
       // make the HTTP request
-      IRestResponse response = restClient.Execute(_request);
+      IRestResponse response = (IRestResponse) apiClient.CallApi("{{path}}", Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams);
+
       if (((int)response.StatusCode) >= 400) {
         throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content);
       }
-      {{#returnType}}return ({{{returnType}}}) ApiInvoker.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
+      {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
       return;{{/returnType}}
     }
     {{/operation}}

modules/swagger-codegen/src/main/resources/csharp/apiInvoker.mustache

@@ -5,26 +5,70 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
+using RestSharp;
 
 namespace {{invokerPackage}} {
   public class ApiInvoker {
-    private static Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
+    public ApiInvoker() {
+      this.basePath = "{{basePath}}";
+    }
+
+    public ApiInvoker(String basePath) {
+      this.basePath = basePath;
+    }
+
+    public string basePath { get; set; }
+    public RestClient restClient { get; set; }
+    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
+
+    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody, 
+      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams) {
+
+      var request = new RestRequest(Path, Method);
+
+      // add default header, if any
+      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
+        request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+
+      // add header parameter, if any
+      foreach(KeyValuePair<string, string> param in HeaderParams)
+        request.AddHeader(param.Key, param.Value);
+     
+      // add query parameter, if any
+      foreach(KeyValuePair<string, string> param in QueryParams)
+        request.AddUrlSegment(param.Key, param.Value);
+
+      // add form parameter, if any
+      foreach(KeyValuePair<string, string> param in FormParams)
+        request.AddParameter(param.Key, param.Value);
+
+      // add file parameter, if any
+      foreach(KeyValuePair<string, string> param in FormParams)
+        request.AddFile(param.Key, param.Value);
+
+      if (PostBody == null) {
+        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
+      }
+
+      return (Object)restClient.Execute(request);
+
+    }
 
     /// <summary>
     /// Add default header
     /// </summary>
     /// <param name="key">  Header field name
     /// <param name="value"> Header field value
     /// <returns></returns>
-    public static void AddDefaultHeader(string key, string value) {
+    public void AddDefaultHeader(string key, string value) {
        defaultHeaderMap.Add(key, value);
     }
 
     /// <summary>
     /// Get default header
     /// </summary>
     /// <returns>Dictionary of default header</returns>
-    public static Dictionary<String, String> GetDefaultHeader() {
+    public Dictionary<String, String> GetDefaultHeader() {
        return defaultHeaderMap;
     }
 
@@ -33,7 +77,7 @@ namespace {{invokerPackage}} {
     /// </summary>
     /// <param name="str"> String to be escaped
     /// <returns>Escaped string</returns>
-    public static string EscapeString(string str) {
+    public string EscapeString(string str) {
       return str;
     }
 
@@ -42,7 +86,7 @@ namespace {{invokerPackage}} {
     /// </summary>
     /// <param name="obj"> The parameter (header, path, query, form)
     /// <returns>Formatted string</returns>
-    public static string ParameterToString(object obj)
+    public string ParameterToString(object obj)
     {
       return (obj is DateTime) ? ((DateTime)obj).ToString ("u") : Convert.ToString (obj);
     }
@@ -53,7 +97,7 @@ namespace {{invokerPackage}} {
     /// <param name="json"> JSON string
     /// <param name="type"> Object type
     /// <returns>Object representation of the JSON string</returns>
-    public static object Deserialize(string content, Type type) {
+    public object Deserialize(string content, Type type) {
       if (type.GetType() == typeof(Object))
         return (Object)content;
 
@@ -71,7 +115,7 @@ namespace {{invokerPackage}} {
     /// </summary>
     /// <param name="obj"> Object 
     /// <returns>JSON string</returns>
-    public static string Serialize(object obj) {
+    public string Serialize(object obj) {
       try
       {
           return obj != null ? JsonConvert.SerializeObject(obj) : null;