diff --git a/; b/;
new file mode 100644
index 00000000000..40162ff7505
--- /dev/null
+++ b/;
@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using RestSharp;
+
+namespace {{packageName}}.Client {
+    /// <summary>
+    /// API client is mainly responible for making the HTTP call to the API backend
+    /// </summary>
+    public class ApiClient {
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient"/> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="{{basePath}}") {
+            this.BasePath = basePath;
+            this.RestClient = new RestClient(this.BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path.</value> 
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient
+        /// </summary>
+        /// <value>The RestClient.</value> 
+        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, FileParameter> fileParams, String[] authSettings) {
+            var response = Task.Run(async () => {
+                                  var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+                                  return resp;
+                                  });
+            return response.Result;
+        }
+    
+        public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
+    
+            var request = new RestRequest(path, method);
+    
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+    
+            // 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.AddQueryParameter(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, FileParameter> param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+    
+    
+            if (postBody != null) {
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
+            }
+    
+            return (Object) await RestClient.ExecuteTaskAsync(request);
+    
+        }
+    
+        /// <summary>
+        /// Add default header
+        /// </summary>
+        /// <param name="key">  Header field name
+        /// <param name="value"> Header field value
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value) {
+            DefaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Get default header
+        /// </summary>
+        /// <returns>Dictionary of default header</returns>
+        public Dictionary<String, String> GetDefaultHeader() {
+            return DefaultHeaderMap;
+        }
+    
+        /// <summary>
+        /// escape string (url-encoded)
+        /// </summary>
+        /// <param name="str"> String to be escaped
+        /// <returns>Escaped string</returns>
+        public string EscapeString(string str) {
+            return str;
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream
+        /// </summary>
+        /// <param name="name"> parameter name</param>
+        /// <param name="stream">Stream</param>
+        /// <returns>FileParameter</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream) {
+                return FileParameter.Create(name, StreamToByteArray(stream), ((FileStream)stream).Name);
+            } else {
+                return FileParameter.Create(name, StreamToByteArray(stream), "temp_name_here");
+            }
+        }
+    
+        /// <summary>
+        /// if parameter is DateTime, output in ISO8601 format
+        /// if parameter is a list of string, join the list with ","
+        /// otherwise just return the string
+        /// </summary>
+        /// <param name="obj"> The parameter (header, path, query, form)
+        /// <returns>Formatted string</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime) {
+                return ((DateTime)obj).ToString ("u");
+            } else if (obj is List<string>) {
+                return String.Join(",", obj as List<string>);
+            } else {
+                return Convert.ToString (obj);
+            }
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object
+        /// </summary>
+        /// <param name="content"> HTTP body (e.g. string, JSON)
+        /// <param name="type"> Object type
+        /// <returns>Object representation of the JSON string</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null) {
+            if (type.GetType() == typeof(Object)) { // return an object
+                return (Object)content;
+            } else if (type.Name == "Stream") { 
+                String fileName, filePath;
+                if (String.IsNullOrEmpty (Configuration.TempFolderPath)) {
+                    filePath = System.IO.Path.GetTempPath ();
+                } else {
+                    filePath = Configuration.TempFolderPath;
+                }
+    
+                Regex regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                Match match = regex.Match(headers.ToString());
+                if (match.Success) {
+                    // replace first and last " or ', if found
+                    fileName = filePath + match.Value.Replace("\"", "").Replace("'","");
+                } else {
+                    fileName = filePath + Guid.NewGuid().ToString();
+                }
+                File.WriteAllText (fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+            } else if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) { // return a datetime object
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            } else if (type.Name == "String" || type.Name.StartsWith("System.Nullable")) { // return primitive 
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e) {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string
+        /// </summary>
+        /// <param name="obj"> Object 
+        /// <returns>JSON string</returns>
+        public string Serialize(object obj) {
+          try
+          {
+              return obj != null ? JsonConvert.SerializeObject(obj) : null;
+          }
+          catch (Exception e) {
+              throw new ApiException(500, e.Message);
+          }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix
+        /// </summary>
+        /// <param name="obj"> Object 
+        /// <returns>API key with prefix</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+          var apiKeyValue = "";
+          Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+          var apiKeyPrefix = "";
+          if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) {
+            return apiKeyPrefix + " " + apiKeyValue;
+          } else {
+            return apiKeyValue;
+          }
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication
+        /// </summary>
+        /// <param name="QueryParams">Query parameters</param>
+        /// <param name="HeaderParams">Header parameters</param>
+        /// <param name="AuthSettings">Authentication settings</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
+          if (authSettings == null || authSettings.Length == 0)
+            return;
+      
+          foreach (string auth in authSettings) {
+            // determine which one to use
+            switch(auth) {
+              {{#authMethods}}
+              case "{{name}}":
+                {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+                {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+                break;
+              {{/authMethods}}
+              default:
+                //TODO show warning about security definition not found
+              break;
+            }
+          }
+    
+        }
+    
+        /// <summary>
+        /// convert a stream to byte array (byte[])
+        /// Ref: http://stackoverflow.com/questions/221925/creating-a-byte-array-from-a-stream
+        /// </summary>
+        /// <param name="input">input stream</param>
+        /// <return>Array of Byte</return>
+        public byte[] StreamToByteArray(Stream input)
+        {
+            byte[] buffer = new byte[16*1024];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    ms.Write(buffer, 0, read);
+                }
+                return ms.ToArray();
+            }
+        }
+    
+        /// <summary>
+        /// Encode string in base64 format 
+        /// </summary>
+        /// <param name="text">String to be encoded</param>
+        public static string Base64Encode(string text) {
+          var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+          return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <param name="dynamic">Object to be casted</param>
+        /// <param name="dest">Target type</param>
+        public static dynamic ConvertType(dynamic source, Type dest) {
+            return Convert.ChangeType(source, dest);
+        }
+  
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index f4ffee145ed..fc3825491d2 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -10,279 +10,280 @@ using Newtonsoft.Json;
 using RestSharp;
 
 namespace {{packageName}}.Client {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
     /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
+    /// API client is mainly responible for making the HTTP call to the API backend
     /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="{{basePath}}") {
-      this.BasePath = basePath;
-      this.RestClient = new RestClient(this.BasePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string BasePath { get; set; }
-
-    /// <summary>
-    /// Gets or sets the RestClient
-    /// </summary>
-    /// <value>The RestClient.</value> 
-    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, FileParameter> fileParams, String[] authSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
-      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
-
-      var request = new RestRequest(path, method);
-
-      UpdateParamsForAuth(queryParams, headerParams, authSettings);
-
-      // 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.AddQueryParameter(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, FileParameter> param in fileParams)
-        request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
-
-
-      if (postBody != null) {
-        request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
-      }
-
-      return (Object) await RestClient.ExecuteTaskAsync(request);
-
-    }
-
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       DefaultHeaderMap.Add(key, value);
-    }
-
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return DefaultHeaderMap;
-    }
-
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
-
-    /// <summary>
-    /// Create FileParameter based on Stream
-    /// </summary>
-    /// <param name="name"> parameter name</param>
-    /// <param name="stream">Stream</param>
-    /// <returns>FileParameter</returns>
-    public FileParameter ParameterToFile(string name, Stream stream)
-    {
-        if (stream is FileStream) {
-            return FileParameter.Create(name, StreamToByteArray(stream), ((FileStream)stream).Name);
-        } else {
-            return FileParameter.Create(name, StreamToByteArray(stream), "temp_name_here");
-        }
-    }
-
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-        return Convert.ToString (obj);
-      }
-    }
-
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="content"> HTTP body (e.g. string, JSON)
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type, IList<Parameter> headers=null) {
-      if (type.GetType() == typeof(Object)) { // return an object
-          return (Object)content;
-      } else if (type.Name == "Stream") { 
-          String fileName, filePath;
-          if (String.IsNullOrEmpty (Configuration.TempFolderPath)) {
-              filePath = System.IO.Path.GetTempPath ();
-          } else {
-              filePath = Configuration.TempFolderPath;
-          }
-
-          Regex regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
-          Match match = regex.Match(headers.ToString());
-          if (match.Success) {
-              // replace first and last " or ', if found
-              fileName = filePath + match.Value.Replace("\"", "").Replace("'","");
-          } else {
-              fileName = filePath + Guid.NewGuid().ToString();
-          }
-          File.WriteAllText (fileName, content);
-          return new FileStream(fileName, FileMode.Open);
-      } else if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) { // return a datetime object
-          return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
-      } else if (type.Name == "String" || type.Name.StartsWith("System.Nullable")) { // return primitive 
-          return ConvertType(content, type); 
-      }
-
-      // at this point, it must be a model (json)
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-          throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKeyIdentifier)
-    {
-      var apiKeyValue = "";
-      Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
-
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
-      if (authSettings == null || authSettings.Length == 0)
-        return;
+    public class ApiClient {
   
-      foreach (string auth in authSettings) {
-        // determine which one to use
-        switch(auth) {
-          {{#authMethods}}
-          case "{{name}}":
-            {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
-            {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-            break;
-          {{/authMethods}}
-          default:
-            //TODO show warning about security definition not found
-          break;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient"/> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="{{basePath}}") {
+            this.BasePath = basePath;
+            this.RestClient = new RestClient(this.BasePath);
         }
-      }
-
-    }
-
-    /// <summary>
-    /// convert a stream to byte array (byte[])
-    /// Ref: http://stackoverflow.com/questions/221925/creating-a-byte-array-from-a-stream
-    /// </summary>
-    /// <param name="input">input stream</param>
-    /// <return>Array of Byte</return>
-    public byte[] StreamToByteArray(Stream input)
-    {
-        byte[] buffer = new byte[16*1024];
-        using (MemoryStream ms = new MemoryStream())
-        {
-            int read;
-            while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
-            {
-                ms.Write(buffer, 0, read);
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path.</value> 
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient
+        /// </summary>
+        /// <value>The RestClient.</value> 
+        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, FileParameter> fileParams, String[] authSettings) {
+            var response = Task.Run(async () => {
+                                  var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+                                  return resp;
+                                  });
+            return response.Result;
+        }
+    
+        public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
+    
+            var request = new RestRequest(path, method);
+    
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+    
+            // 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.AddQueryParameter(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, FileParameter> param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+    
+    
+            if (postBody != null) {
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
             }
-            return ms.ToArray();
+    
+            return (Object) await RestClient.ExecuteTaskAsync(request);
+    
         }
+    
+        /// <summary>
+        /// Add default header
+        /// </summary>
+        /// <param name="key"> Header field name </param>
+        /// <param name="value"> Header field value </param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value) {
+            DefaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Get default header
+        /// </summary>
+        /// <returns>Dictionary of default header</returns>
+        public Dictionary<String, String> GetDefaultHeader() {
+            return DefaultHeaderMap;
+        }
+    
+        /// <summary>
+        /// escape string (url-encoded)
+        /// </summary>
+        /// <param name="str">String to be escaped</param>
+        /// <returns>Escaped string</returns>
+        public string EscapeString(string str) {
+            return str;
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream
+        /// </summary>
+        /// <param name="name">parameter name</param>
+        /// <param name="stream">Input stream</param>
+        /// <returns>FileParameter</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream) {
+                return FileParameter.Create(name, StreamToByteArray(stream), ((FileStream)stream).Name);
+            } else {
+                return FileParameter.Create(name, StreamToByteArray(stream), "temp_name_here");
+            }
+        }
+    
+        /// <summary>
+        /// if parameter is DateTime, output in ISO8601 format
+        /// if parameter is a list of string, join the list with ","
+        /// otherwise just return the string
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form)</param>
+        /// <returns>Formatted string</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime) {
+                return ((DateTime)obj).ToString ("u");
+            } else if (obj is List<string>) {
+                return String.Join(",", obj as List<string>);
+            } else {
+                return Convert.ToString (obj);
+            }
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON)</param>
+        /// <param name="type">Object type</param>
+        /// <returns>Object representation of the JSON string</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null) {
+            if (type.GetType() == typeof(Object)) { // return an object
+                return (Object)content;
+            } else if (type.Name == "Stream") { 
+                String fileName, filePath;
+                if (String.IsNullOrEmpty (Configuration.TempFolderPath)) {
+                    filePath = System.IO.Path.GetTempPath ();
+                } else {
+                    filePath = Configuration.TempFolderPath;
+                }
+    
+                Regex regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                Match match = regex.Match(headers.ToString());
+                if (match.Success) {
+                    // replace first and last " or ', if found
+                    fileName = filePath + match.Value.Replace("\"", "").Replace("'","");
+                } else {
+                    fileName = filePath + Guid.NewGuid().ToString();
+                }
+                File.WriteAllText (fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+            } else if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) { // return a datetime object
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            } else if (type.Name == "String" || type.Name.StartsWith("System.Nullable")) { // return primitive 
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e) {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string
+        /// </summary>
+        /// <param name="obj">Object</param>
+        /// <returns>JSON string</returns>
+        public string Serialize(object obj) {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e) {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix
+        /// </summary>
+        /// <param name="obj">Object</param>
+        /// <returns>API key with prefix</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) {
+                return apiKeyPrefix + " " + apiKeyValue;
+            } else {
+                return apiKeyValue;
+            }
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication
+        /// </summary>
+        /// <param name="QueryParams">Query parameters</param>
+        /// <param name="HeaderParams">Header parameters</param>
+        /// <param name="AuthSettings">Authentication settings</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
+      
+            foreach (string auth in authSettings) {
+                // determine which one to use
+                switch(auth) {
+                    {{#authMethods}}
+                    case "{{name}}":
+                        {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+                        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+                        break;
+                    {{/authMethods}}
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+    
+        }
+    
+        /// <summary>
+        /// convert a stream to byte array (byte[])
+        /// Ref: http://stackoverflow.com/questions/221925/creating-a-byte-array-from-a-stream
+        /// </summary>
+        /// <param name="input">input stream</param>
+        /// <return>Array of Byte</return>
+        public byte[] StreamToByteArray(Stream input)
+        {
+            byte[] buffer = new byte[16*1024];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    ms.Write(buffer, 0, read);
+                }
+                return ms.ToArray();
+            }
+        }
+    
+        /// <summary>
+        /// Encode string in base64 format 
+        /// </summary>
+        /// <param name="text">String to be encoded</param>
+        public static string Base64Encode(string text) {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <param name="dynamic">Object to be casted</param>
+        /// <param name="dest">Target type</param>
+        public static dynamic ConvertType(dynamic source, Type dest) {
+            return Convert.ChangeType(source, dest);
+        }
+  
     }
-
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
-    }
-
-    /// <summary>
-    /// Dynamically cast the object into target type
-    /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
-    /// </summary>
-    /// <param name="dynamic">Object to be casted</param>
-    /// <param name="dest">Target type</param>
-    public static dynamic ConvertType(dynamic source, Type dest) {
-        return Convert.ChangeType(source, dest);
-    }
-
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 47fcc1bef1d..2f6cca4c388 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -8,165 +8,162 @@ using {{packageName}}.Client;
 {{/hasImport}}
 
 namespace {{packageName}}.Api {
-  {{#operations}}
-  public interface I{{classname}} {
-    {{#operation}}
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
-    {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
-    {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-    {{/operation}}
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class {{classname}} : I{{classname}} {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
-    /// <returns></returns>
-    public {{classname}}(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.ApiClient = Configuration.DefaultApiClient; 
-      } else {
-        this.ApiClient = apiClient;
-      }
+    {{#operations}}
+    public interface I{{classname}} {
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>
+        {{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+  
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>
+        Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        {{/operation}}
     }
-
+  
     /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
-    /// <returns></returns>
-    public {{classname}}(String basePath)
-    {
-      this.ApiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.ApiClient.BasePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.ApiClient.BasePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient ApiClient {get; set;}
-
-
-    {{#operation}}
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
-    public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-
-      {{#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}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-
-      {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}return;{{/returnType}}
-    }
-
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
-    public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-
-      {{#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}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-      {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}
-      return;{{/returnType}}
-    }
-    {{/operation}}
-  }  
-  {{/operations}}
+    public class {{classname}} : I{{classname}} {
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public {{classname}}(ApiClient apiClient = null) {
+            if (apiClient == null) { // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            } else {
+                this.ApiClient = apiClient;
+            }
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public {{classname}}(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath) {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath) {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>The API client</value>
+        public ApiClient ApiClient {get; set;}
+    
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>            
+        public {{{returnType}}}{{/returnType}}{{^returnType}}public void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
+    
+            {{#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}}
+    
+            var path = "{{path}}";
+            path = path.Replace("{format}", "json");
+            {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
+            {{/pathParams}}
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+            }
+    
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}return;{{/returnType}}
+        }
+    
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>
+        public async Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
+            {{#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}}
+    
+            var path = "{{path}}";
+            path = path.Replace("{format}", "json");
+            {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
+            {{/pathParams}}
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+            }
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}
+            return;{{/returnType}}
+        }
+        {{/operation}}
+    }  
+    {{/operations}}
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index ab213f94f5a..82f7d1a8fa0 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -7,825 +7,792 @@ using IO.Swagger.Client;
 using IO.Swagger.Model;
 
 namespace IO.Swagger.Api {
+    
+    public interface IPetApi {
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        void UpdatePet (Pet body);
   
-  public interface IPetApi {
-    
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    void UpdatePet (Pet body);
-
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    Task UpdatePetAsync (Pet body);
-    
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    void AddPet (Pet body);
-
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    Task AddPetAsync (Pet body);
-    
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByStatus (List<string> status);
-
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByStatusAsync (List<string> status);
-    
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByTags (List<string> tags);
-
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
-    
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    Pet GetPetById (long? petId);
-
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    Task<Pet> GetPetByIdAsync (long? petId);
-    
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be updated</param>
-    /// <param name="name">Updated name of the pet</param>
-    /// <param name="status">Updated status of the pet</param>
-    
-    void UpdatePetWithForm (string petId, string name, string status);
-
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be updated</param>
-    /// <param name="name">Updated name of the pet</param>
-    /// <param name="status">Updated status of the pet</param>
-    
-    Task UpdatePetWithFormAsync (string petId, string name, string status);
-    
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="apiKey"></param>
-    /// <param name="petId">Pet id to delete</param>
-    
-    void DeletePet (string apiKey, long? petId);
-
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="apiKey"></param>
-    /// <param name="petId">Pet id to delete</param>
-    
-    Task DeletePetAsync (string apiKey, long? petId);
-    
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <param name="petId">ID of pet to update</param>
-    /// <param name="additionalMetadata">Additional data to pass to server</param>
-    /// <param name="file">file to upload</param>
-    
-    void UploadFile (long? petId, string additionalMetadata, Stream file);
-
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <param name="petId">ID of pet to update</param>
-    /// <param name="additionalMetadata">Additional data to pass to server</param>
-    /// <param name="file">file to upload</param>
-    
-    Task UploadFileAsync (long? petId, string additionalMetadata, Stream file);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class PetApi : IPetApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
-    /// <returns></returns>
-    public PetApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.ApiClient = Configuration.DefaultApiClient; 
-      } else {
-        this.ApiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public PetApi(String basePath)
-    {
-      this.ApiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.ApiClient.BasePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.ApiClient.BasePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient ApiClient {get; set;}
-
-
-    
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    public void UpdatePet (Pet body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    public async Task UpdatePetAsync (Pet body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    public void AddPet (Pet body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="body">Pet object that needs to be added to the store</param>
-    
-    public async Task AddPetAsync (Pet body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByStatus (List<string> status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-
-      return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
-    }
-
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByStatusAsync (List<string> status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-      return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
-    }
-    
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByTags (List<string> tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-
-      return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
-    }
-
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByTagsAsync (List<string> tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-      return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
-    }
-    
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    public Pet GetPetById (long? petId) {
-
-      
-      // verify the required parameter 'petId' is set
-      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-
-      return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
-    }
-
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    public async Task<Pet> GetPetByIdAsync (long? petId) {
-
-      
-          // verify the required parameter 'petId' is set
-          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-      return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
-    }
-    
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be updated</param>
-    /// <param name="name">Updated name of the pet</param>
-    /// <param name="status">Updated status of the pet</param>
-    
-    public void UpdatePetWithForm (string petId, string name, string status) {
-
-      
-      // verify the required parameter 'petId' is set
-      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
-      if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <param name="petId">ID of pet that needs to be updated</param>
-    /// <param name="name">Updated name of the pet</param>
-    /// <param name="status">Updated status of the pet</param>
-    
-    public async Task UpdatePetWithFormAsync (string petId, string name, string status) {
-
-      
-          // verify the required parameter 'petId' is set
-          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
-      if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="apiKey"></param>
-    /// <param name="petId">Pet id to delete</param>
-    
-    public void DeletePet (string apiKey, long? petId) {
-
-      
-      // verify the required parameter 'petId' is set
-      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-       if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="apiKey"></param>
-    /// <param name="petId">Pet id to delete</param>
-    
-    public async Task DeletePetAsync (string apiKey, long? petId) {
-
-      
-          // verify the required parameter 'petId' is set
-          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-       if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <param name="petId">ID of pet to update</param>
-    /// <param name="additionalMetadata">Additional data to pass to server</param>
-    /// <param name="file">file to upload</param>
-    
-    public void UploadFile (long? petId, string additionalMetadata, Stream file) {
-
-      
-      // verify the required parameter 'petId' is set
-      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
-      if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <param name="petId">ID of pet to update</param>
-    /// <param name="additionalMetadata">Additional data to pass to server</param>
-    /// <param name="file">file to upload</param>
-    
-    public async Task UploadFileAsync (long? petId, string additionalMetadata, Stream file) {
-
-      
-          // verify the required parameter 'petId' is set
-          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
-      if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        Task UpdatePetAsync (Pet body);
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        void AddPet (Pet body);
   
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        Task AddPetAsync (Pet body);
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        List<Pet> FindPetsByStatus (List<string> status);
+  
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        Task<List<Pet>> FindPetsByStatusAsync (List<string> status);
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        List<Pet> FindPetsByTags (List<string> tags);
+  
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        Pet GetPetById (long? petId);
+  
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        Task<Pet> GetPetByIdAsync (long? petId);
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
+        void UpdatePetWithForm (string petId, string name, string status);
+  
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
+        Task UpdatePetWithFormAsync (string petId, string name, string status);
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        void DeletePet (string apiKey, long? petId);
+  
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        Task DeletePetAsync (string apiKey, long? petId);
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        void UploadFile (long? petId, string additionalMetadata, Stream file);
+  
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        Task UploadFileAsync (long? petId, string additionalMetadata, Stream file);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class PetApi : IPetApi {
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public PetApi(ApiClient apiClient = null) {
+            if (apiClient == null) { // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            } else {
+                this.ApiClient = apiClient;
+            }
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public PetApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath) {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath) {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>The API client</value>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        public void UpdatePet (Pet body) {
+    
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        public async Task UpdatePetAsync (Pet body) {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        public void AddPet (Pet body) {
+    
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        public async Task AddPetAsync (Pet body) {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param> 
+        /// <returns>List<Pet></returns>            
+        public List<Pet> FindPetsByStatus (List<string> status) {
+    
+            
+    
+            var path = "/pet/findByStatus";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+            }
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        public async Task<List<Pet>> FindPetsByStatusAsync (List<string> status) {
+            
+    
+            var path = "/pet/findByStatus";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+            }
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param> 
+        /// <returns>List<Pet></returns>            
+        public List<Pet> FindPetsByTags (List<string> tags) {
+    
+            
+    
+            var path = "/pet/findByTags";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+            }
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        public async Task<List<Pet>> FindPetsByTagsAsync (List<string> tags) {
+            
+    
+            var path = "/pet/findByTags";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+            }
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>Pet</returns>            
+        public Pet GetPetById (long? petId) {
+    
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+            }
+    
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+    
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        public async Task<Pet> GetPetByIdAsync (long? petId) {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+            }
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be updated</param> 
+        /// <param name="name">Updated name of the pet</param> 
+        /// <param name="status">Updated status of the pet</param> 
+        public void UpdatePetWithForm (string petId, string name, string status) {
+    
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
+        public async Task UpdatePetWithFormAsync (string petId, string name, string status) {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param> 
+        /// <param name="petId">Pet id to delete</param> 
+        public void DeletePet (string apiKey, long? petId) {
+    
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        public async Task DeletePetAsync (string apiKey, long? petId) {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <param name="petId">ID of pet to update</param> 
+        /// <param name="additionalMetadata">Additional data to pass to server</param> 
+        /// <param name="file">file to upload</param> 
+        public void UploadFile (long? petId, string additionalMetadata, Stream file) {
+    
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/pet/{petId}/uploadImage";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        public async Task UploadFileAsync (long? petId, string additionalMetadata, Stream file) {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/pet/{petId}/uploadImage";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+    }  
+    
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index ad9e296721c..97dedb9a1dd 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -7,421 +7,410 @@ using IO.Swagger.Client;
 using IO.Swagger.Model;
 
 namespace IO.Swagger.Api {
+    
+    public interface IStoreApi {
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        Dictionary<String, int?> GetInventory ();
   
-  public interface IStoreApi {
-    
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    /// <returns>Dictionary<String, int?></returns>
-    Dictionary<String, int?> GetInventory ();
-
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    /// <returns>Dictionary<String, int?></returns>
-    Task<Dictionary<String, int?>> GetInventoryAsync ();
-    
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Order PlaceOrder (Order body);
-
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Task<Order> PlaceOrderAsync (Order body);
-    
-    /// <summary>
-    /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    /// </summary>
-    /// <param name="orderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    Order GetOrderById (string orderId);
-
-    /// <summary>
-    /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    /// </summary>
-    /// <param name="orderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    Task<Order> GetOrderByIdAsync (string orderId);
-    
-    /// <summary>
-    /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    /// </summary>
-    /// <param name="orderId">ID of the order that needs to be deleted</param>
-    
-    void DeleteOrder (string orderId);
-
-    /// <summary>
-    /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    /// </summary>
-    /// <param name="orderId">ID of the order that needs to be deleted</param>
-    
-    Task DeleteOrderAsync (string orderId);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class StoreApi : IStoreApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
-    /// <returns></returns>
-    public StoreApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.ApiClient = Configuration.DefaultApiClient; 
-      } else {
-        this.ApiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public StoreApi(String basePath)
-    {
-      this.ApiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.ApiClient.BasePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.ApiClient.BasePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient ApiClient {get; set;}
-
-
-    
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    /// <returns>Dictionary<String, int?></returns>
-    public Dictionary<String, int?> GetInventory () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-
-      return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
-    }
-
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    /// <returns>Dictionary<String, int?></returns>
-    public async Task<Dictionary<String, int?>> GetInventoryAsync () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-      return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
-    }
-    
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    public Order PlaceOrder (Order body) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-
-      return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
-    }
-
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    public async Task<Order> PlaceOrderAsync (Order body) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-      return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
-    }
-    
-    /// <summary>
-    /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    /// </summary>
-    /// <param name="orderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    public Order GetOrderById (string orderId) {
-
-      
-      // verify the required parameter 'orderId' is set
-      if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-
-      return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
-    }
-
-    /// <summary>
-    /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    /// </summary>
-    /// <param name="orderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    public async Task<Order> GetOrderByIdAsync (string orderId) {
-
-      
-          // verify the required parameter 'orderId' is set
-          if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-      return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
-    }
-    
-    /// <summary>
-    /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    /// </summary>
-    /// <param name="orderId">ID of the order that needs to be deleted</param>
-    
-    public void DeleteOrder (string orderId) {
-
-      
-      // verify the required parameter 'orderId' is set
-      if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    /// </summary>
-    /// <param name="orderId">ID of the order that needs to be deleted</param>
-    
-    public async Task DeleteOrderAsync (string orderId) {
-
-      
-          // verify the required parameter 'orderId' is set
-          if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        Task<Dictionary<String, int?>> GetInventoryAsync ();
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        Order PlaceOrder (Order body);
   
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        Task<Order> PlaceOrderAsync (Order body);
+        
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        Order GetOrderById (string orderId);
+  
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        Task<Order> GetOrderByIdAsync (string orderId);
+        
+        /// <summary>
+        /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+        /// </summary>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        void DeleteOrder (string orderId);
+  
+        /// <summary>
+        /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+        /// </summary>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        Task DeleteOrderAsync (string orderId);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class StoreApi : IStoreApi {
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public StoreApi(ApiClient apiClient = null) {
+            if (apiClient == null) { // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            } else {
+                this.ApiClient = apiClient;
+            }
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public StoreApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath) {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath) {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>The API client</value>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>            
+        public Dictionary<String, int?> GetInventory () {
+    
+            
+    
+            var path = "/store/inventory";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+            }
+    
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        public async Task<Dictionary<String, int?>> GetInventoryAsync () {
+            
+    
+            var path = "/store/inventory";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+            }
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param> 
+        /// <returns>Order</returns>            
+        public Order PlaceOrder (Order body) {
+    
+            
+    
+            var path = "/store/order";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+            }
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        public async Task<Order> PlaceOrderAsync (Order body) {
+            
+    
+            var path = "/store/order";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+            }
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <param name="orderId">ID of pet that needs to be fetched</param> 
+        /// <returns>Order</returns>            
+        public Order GetOrderById (string orderId) {
+    
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+            }
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        public async Task<Order> GetOrderByIdAsync (string orderId) {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+            }
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <summary>
+        /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+        /// </summary>
+        /// <param name="orderId">ID of the order that needs to be deleted</param> 
+        public void DeleteOrder (string orderId) {
+    
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+        /// </summary>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        public async Task DeleteOrderAsync (string orderId) {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+    }  
+    
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 92b35a640e6..f497b9d35a2 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -7,796 +7,760 @@ using IO.Swagger.Client;
 using IO.Swagger.Model;
 
 namespace IO.Swagger.Api {
+    
+    public interface IUserApi {
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        void CreateUser (User body);
   
-  public interface IUserApi {
-    
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="body">Created user object</param>
-    
-    void CreateUser (User body);
-
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="body">Created user object</param>
-    
-    Task CreateUserAsync (User body);
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    void CreateUsersWithArrayInput (List<User> body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    Task CreateUsersWithArrayInputAsync (List<User> body);
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    void CreateUsersWithListInput (List<User> body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    Task CreateUsersWithListInputAsync (List<User> body);
-    
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="username">The user name for login</param>
-    /// <param name="password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    string LoginUser (string username, string password);
-
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="username">The user name for login</param>
-    /// <param name="password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    Task<string> LoginUserAsync (string username, string password);
-    
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    void LogoutUser ();
-
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    Task LogoutUserAsync ();
-    
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    User GetUserByName (string username);
-
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    Task<User> GetUserByNameAsync (string username);
-    
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">name that need to be deleted</param>
-    /// <param name="body">Updated user object</param>
-    
-    void UpdateUser (string username, User body);
-
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">name that need to be deleted</param>
-    /// <param name="body">Updated user object</param>
-    
-    Task UpdateUserAsync (string username, User body);
-    
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">The name that needs to be deleted</param>
-    
-    void DeleteUser (string username);
-
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">The name that needs to be deleted</param>
-    
-    Task DeleteUserAsync (string username);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class UserApi : IUserApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
-    /// <returns></returns>
-    public UserApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.ApiClient = Configuration.DefaultApiClient; 
-      } else {
-        this.ApiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public UserApi(String basePath)
-    {
-      this.ApiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.ApiClient.BasePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.ApiClient.BasePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient ApiClient {get; set;}
-
-
-    
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="body">Created user object</param>
-    
-    public void CreateUser (User body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="body">Created user object</param>
-    
-    public async Task CreateUserAsync (User body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    public void CreateUsersWithArrayInput (List<User> body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    public async Task CreateUsersWithArrayInputAsync (List<User> body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    public void CreateUsersWithListInput (List<User> body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="body">List of user object</param>
-    
-    public async Task CreateUsersWithListInputAsync (List<User> body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="username">The user name for login</param>
-    /// <param name="password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    public string LoginUser (string username, string password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
-       if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-
-      return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
-    }
-
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="username">The user name for login</param>
-    /// <param name="password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    public async Task<string> LoginUserAsync (string username, string password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-       if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
-       if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-      return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
-    }
-    
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    public void LogoutUser () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    public async Task LogoutUserAsync () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    public User GetUserByName (string username) {
-
-      
-      // verify the required parameter 'username' is set
-      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-
-      return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
-    }
-
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    public async Task<User> GetUserByNameAsync (string username) {
-
-      
-          // verify the required parameter 'username' is set
-          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-      return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
-    }
-    
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">name that need to be deleted</param>
-    /// <param name="body">Updated user object</param>
-    
-    public void UpdateUser (string username, User body) {
-
-      
-      // verify the required parameter 'username' is set
-      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">name that need to be deleted</param>
-    /// <param name="body">Updated user object</param>
-    
-    public async Task UpdateUserAsync (string username, User body) {
-
-      
-          // verify the required parameter 'username' is set
-          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = ApiClient.Serialize(body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">The name that needs to be deleted</param>
-    
-    public void DeleteUser (string username) {
-
-      
-      // verify the required parameter 'username' is set
-      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-
-      return;
-    }
-
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="username">The name that needs to be deleted</param>
-    
-    public async Task DeleteUserAsync (string username) {
-
-      
-          // verify the required parameter 'username' is set
-          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, FileParameter>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        Task CreateUserAsync (User body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        void CreateUsersWithArrayInput (List<User> body);
   
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        Task CreateUsersWithArrayInputAsync (List<User> body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        void CreateUsersWithListInput (List<User> body);
+  
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        Task CreateUsersWithListInputAsync (List<User> body);
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        string LoginUser (string username, string password);
+  
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        Task<string> LoginUserAsync (string username, string password);
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        void LogoutUser ();
+  
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        Task LogoutUserAsync ();
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <returns>User</returns>
+        User GetUserByName (string username);
+  
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <returns>User</returns>
+        Task<User> GetUserByNameAsync (string username);
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        void UpdateUser (string username, User body);
+  
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        Task UpdateUserAsync (string username, User body);
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        void DeleteUser (string username);
+  
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        Task DeleteUserAsync (string username);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class UserApi : IUserApi {
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public UserApi(ApiClient apiClient = null) {
+            if (apiClient == null) { // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            } else {
+                this.ApiClient = apiClient;
+            }
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public UserApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath) {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath) {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>The API client</value>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param> 
+        public void CreateUser (User body) {
+    
+            
+    
+            var path = "/user";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        public async Task CreateUserAsync (User body) {
+            
+    
+            var path = "/user";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        public void CreateUsersWithArrayInput (List<User> body) {
+    
+            
+    
+            var path = "/user/createWithArray";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        public async Task CreateUsersWithArrayInputAsync (List<User> body) {
+            
+    
+            var path = "/user/createWithArray";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        public void CreateUsersWithListInput (List<User> body) {
+    
+            
+    
+            var path = "/user/createWithList";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        public async Task CreateUsersWithListInputAsync (List<User> body) {
+            
+    
+            var path = "/user/createWithList";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param> 
+        /// <param name="password">The password for login in clear text</param> 
+        /// <returns>string</returns>            
+        public string LoginUser (string username, string password) {
+    
+            
+    
+            var path = "/user/login";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+             if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+            }
+    
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+    
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        public async Task<string> LoginUserAsync (string username, string password) {
+            
+    
+            var path = "/user/login";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+             if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+            }
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        public void LogoutUser () {
+    
+            
+    
+            var path = "/user/logout";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        public async Task LogoutUserAsync () {
+            
+    
+            var path = "/user/logout";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param> 
+        /// <returns>User</returns>            
+        public User GetUserByName (string username) {
+    
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+            }
+    
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+    
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <returns>User</returns>
+        public async Task<User> GetUserByNameAsync (string username) {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+            }
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param> 
+        /// <param name="body">Updated user object</param> 
+        public void UpdateUser (string username, User body) {
+    
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        public async Task UpdateUserAsync (string username, User body) {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param> 
+        public void DeleteUser (string username) {
+    
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+            }
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        public async Task DeleteUserAsync (string username) {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400) {
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+            }
+            
+            return;
+        }
+        
+    }  
+    
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
index 4940687de3d..1e259af15d4 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -10,284 +10,285 @@ using Newtonsoft.Json;
 using RestSharp;
 
 namespace IO.Swagger.Client {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
     /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
+    /// API client is mainly responible for making the HTTP call to the API backend
     /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="http://petstore.swagger.io/v2") {
-      this.BasePath = basePath;
-      this.RestClient = new RestClient(this.BasePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string BasePath { get; set; }
-
-    /// <summary>
-    /// Gets or sets the RestClient
-    /// </summary>
-    /// <value>The RestClient.</value> 
-    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, FileParameter> fileParams, String[] authSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
-      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
-
-      var request = new RestRequest(path, method);
-
-      UpdateParamsForAuth(queryParams, headerParams, authSettings);
-
-      // 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.AddQueryParameter(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, FileParameter> param in fileParams)
-        request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
-
-
-      if (postBody != null) {
-        request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
-      }
-
-      return (Object) await RestClient.ExecuteTaskAsync(request);
-
-    }
-
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       DefaultHeaderMap.Add(key, value);
-    }
-
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return DefaultHeaderMap;
-    }
-
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
-
-    /// <summary>
-    /// Create FileParameter based on Stream
-    /// </summary>
-    /// <param name="name"> parameter name</param>
-    /// <param name="stream">Stream</param>
-    /// <returns>FileParameter</returns>
-    public FileParameter ParameterToFile(string name, Stream stream)
-    {
-        if (stream is FileStream) {
-            return FileParameter.Create(name, StreamToByteArray(stream), ((FileStream)stream).Name);
-        } else {
-            return FileParameter.Create(name, StreamToByteArray(stream), "temp_name_here");
-        }
-    }
-
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-        return Convert.ToString (obj);
-      }
-    }
-
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="content"> HTTP body (e.g. string, JSON)
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type, IList<Parameter> headers=null) {
-      if (type.GetType() == typeof(Object)) { // return an object
-          return (Object)content;
-      } else if (type.Name == "Stream") { 
-          String fileName, filePath;
-          if (String.IsNullOrEmpty (Configuration.TempFolderPath)) {
-              filePath = System.IO.Path.GetTempPath ();
-          } else {
-              filePath = Configuration.TempFolderPath;
-          }
-
-          Regex regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
-          Match match = regex.Match(headers.ToString());
-          if (match.Success) {
-              // replace first and last " or ', if found
-              fileName = filePath + match.Value.Replace("\"", "").Replace("'","");
-          } else {
-              fileName = filePath + Guid.NewGuid().ToString();
-          }
-          File.WriteAllText (fileName, content);
-          return new FileStream(fileName, FileMode.Open);
-      } else if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) { // return a datetime object
-          return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
-      } else if (type.Name == "String" || type.Name.StartsWith("System.Nullable")) { // return primitive 
-          return ConvertType(content, type); 
-      }
-
-      // at this point, it must be a model (json)
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-          throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKeyIdentifier)
-    {
-      var apiKeyValue = "";
-      Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
-
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
-      if (authSettings == null || authSettings.Length == 0)
-        return;
+    public class ApiClient {
   
-      foreach (string auth in authSettings) {
-        // determine which one to use
-        switch(auth) {
-          
-          case "api_key":
-            headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
-            
-            break;
-          
-          case "petstore_auth":
-            
-            //TODO support oauth
-            break;
-          
-          default:
-            //TODO show warning about security definition not found
-          break;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient"/> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="http://petstore.swagger.io/v2") {
+            this.BasePath = basePath;
+            this.RestClient = new RestClient(this.BasePath);
         }
-      }
-
-    }
-
-    /// <summary>
-    /// convert a stream to byte array (byte[])
-    /// Ref: http://stackoverflow.com/questions/221925/creating-a-byte-array-from-a-stream
-    /// </summary>
-    /// <param name="input">input stream</param>
-    /// <return>Array of Byte</return>
-    public byte[] StreamToByteArray(Stream input)
-    {
-        byte[] buffer = new byte[16*1024];
-        using (MemoryStream ms = new MemoryStream())
-        {
-            int read;
-            while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
-            {
-                ms.Write(buffer, 0, read);
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path.</value> 
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient
+        /// </summary>
+        /// <value>The RestClient.</value> 
+        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, FileParameter> fileParams, String[] authSettings) {
+            var response = Task.Run(async () => {
+                                  var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+                                  return resp;
+                                  });
+            return response.Result;
+        }
+    
+        public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
+    
+            var request = new RestRequest(path, method);
+    
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+    
+            // 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.AddQueryParameter(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, FileParameter> param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+    
+    
+            if (postBody != null) {
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
             }
-            return ms.ToArray();
+    
+            return (Object) await RestClient.ExecuteTaskAsync(request);
+    
         }
+    
+        /// <summary>
+        /// Add default header
+        /// </summary>
+        /// <param name="key"> Header field name </param>
+        /// <param name="value"> Header field value </param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value) {
+            DefaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Get default header
+        /// </summary>
+        /// <returns>Dictionary of default header</returns>
+        public Dictionary<String, String> GetDefaultHeader() {
+            return DefaultHeaderMap;
+        }
+    
+        /// <summary>
+        /// escape string (url-encoded)
+        /// </summary>
+        /// <param name="str">String to be escaped</param>
+        /// <returns>Escaped string</returns>
+        public string EscapeString(string str) {
+            return str;
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream
+        /// </summary>
+        /// <param name="name">parameter name</param>
+        /// <param name="stream">Input stream</param>
+        /// <returns>FileParameter</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream) {
+                return FileParameter.Create(name, StreamToByteArray(stream), ((FileStream)stream).Name);
+            } else {
+                return FileParameter.Create(name, StreamToByteArray(stream), "temp_name_here");
+            }
+        }
+    
+        /// <summary>
+        /// if parameter is DateTime, output in ISO8601 format
+        /// if parameter is a list of string, join the list with ","
+        /// otherwise just return the string
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form)</param>
+        /// <returns>Formatted string</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime) {
+                return ((DateTime)obj).ToString ("u");
+            } else if (obj is List<string>) {
+                return String.Join(",", obj as List<string>);
+            } else {
+                return Convert.ToString (obj);
+            }
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON)</param>
+        /// <param name="type">Object type</param>
+        /// <returns>Object representation of the JSON string</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null) {
+            if (type.GetType() == typeof(Object)) { // return an object
+                return (Object)content;
+            } else if (type.Name == "Stream") { 
+                String fileName, filePath;
+                if (String.IsNullOrEmpty (Configuration.TempFolderPath)) {
+                    filePath = System.IO.Path.GetTempPath ();
+                } else {
+                    filePath = Configuration.TempFolderPath;
+                }
+    
+                Regex regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                Match match = regex.Match(headers.ToString());
+                if (match.Success) {
+                    // replace first and last " or ', if found
+                    fileName = filePath + match.Value.Replace("\"", "").Replace("'","");
+                } else {
+                    fileName = filePath + Guid.NewGuid().ToString();
+                }
+                File.WriteAllText (fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+            } else if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) { // return a datetime object
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            } else if (type.Name == "String" || type.Name.StartsWith("System.Nullable")) { // return primitive 
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e) {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string
+        /// </summary>
+        /// <param name="obj">Object</param>
+        /// <returns>JSON string</returns>
+        public string Serialize(object obj) {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e) {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix
+        /// </summary>
+        /// <param name="obj">Object</param>
+        /// <returns>API key with prefix</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) {
+                return apiKeyPrefix + " " + apiKeyValue;
+            } else {
+                return apiKeyValue;
+            }
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication
+        /// </summary>
+        /// <param name="QueryParams">Query parameters</param>
+        /// <param name="HeaderParams">Header parameters</param>
+        /// <param name="AuthSettings">Authentication settings</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
+      
+            foreach (string auth in authSettings) {
+                // determine which one to use
+                switch(auth) {
+                    
+                    case "api_key":
+                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
+                        
+                        break;
+                    
+                    case "petstore_auth":
+                        
+                        //TODO support oauth
+                        break;
+                    
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+    
+        }
+    
+        /// <summary>
+        /// convert a stream to byte array (byte[])
+        /// Ref: http://stackoverflow.com/questions/221925/creating-a-byte-array-from-a-stream
+        /// </summary>
+        /// <param name="input">input stream</param>
+        /// <return>Array of Byte</return>
+        public byte[] StreamToByteArray(Stream input)
+        {
+            byte[] buffer = new byte[16*1024];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    ms.Write(buffer, 0, read);
+                }
+                return ms.ToArray();
+            }
+        }
+    
+        /// <summary>
+        /// Encode string in base64 format 
+        /// </summary>
+        /// <param name="text">String to be encoded</param>
+        public static string Base64Encode(string text) {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <param name="dynamic">Object to be casted</param>
+        /// <param name="dest">Target type</param>
+        public static dynamic ConvertType(dynamic source, Type dest) {
+            return Convert.ChangeType(source, dest);
+        }
+  
     }
-
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
-    }
-
-    /// <summary>
-    /// Dynamically cast the object into target type
-    /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
-    /// </summary>
-    /// <param name="dynamic">Object to be casted</param>
-    /// <param name="dest">Target type</param>
-    public static dynamic ConvertType(dynamic source, Type dest) {
-        return Convert.ChangeType(source, dest);
-    }
-
-  }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
index e5bbf0a9ef2..870fb99f816 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
index e5bbf0a9ef2..870fb99f816 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb differ