Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…

…rator into use-java8-offsetdatetime-for-clients

modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache

@@ -27,7 +27,7 @@ using RestSharpMethod = RestSharp.Method;
 namespace {{packageName}}.Client
 {
     /// <summary>
-    /// Allows RestSharp to Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON. 
+    /// Allows RestSharp to Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON.
     /// </summary>
     internal class CustomJsonCodec : RestSharp.Serializers.ISerializer, RestSharp.Deserializers.IDeserializer
     {
@@ -241,7 +241,7 @@ namespace {{packageName}}.Client
             if (path == null) throw new ArgumentNullException("path");
             if (options == null) throw new ArgumentNullException("options");
             if (configuration == null) throw new ArgumentNullException("configuration");
-            
+
             RestRequest request = new RestRequest(Method(method))
             {
                 Resource = path,
@@ -255,7 +255,7 @@ namespace {{packageName}}.Client
                     request.AddParameter(pathParam.Key, pathParam.Value, ParameterType.UrlSegment);
                 }
             }
-            
+
             if (options.QueryParameters != null)
             {
                 foreach (var queryParam in options.QueryParameters)
@@ -337,7 +337,7 @@ namespace {{packageName}}.Client
                     request.AddCookie(cookie.Name, cookie.Value);
                 }
             }
-            
+
             return request;
         }
 
@@ -351,7 +351,7 @@ namespace {{packageName}}.Client
                 ErrorText = response.ErrorMessage,
                 Cookies = new List<Cookie>()
             };
-            
+
             if (response.Headers != null)
             {
                 foreach (var responseHeader in response.Headers)
@@ -366,9 +366,9 @@ namespace {{packageName}}.Client
                 {
                     transformed.Cookies.Add(
                         new Cookie(
-                            responseCookies.Name, 
-                            responseCookies.Value, 
-                            responseCookies.Path, 
+                            responseCookies.Name,
+                            responseCookies.Value,
+                            responseCookies.Path,
                             responseCookies.Domain)
                         );
                 }

modules/openapi-generator/src/main/resources/csharp-netcore/ApiResponse.mustache

@@ -55,7 +55,7 @@ namespace {{packageName}}.Client
     public class ApiResponse<T> : IApiResponse
     {
         #region Properties
-        
+
         /// <summary>
         /// Gets or sets the status code (HTTP status code)
         /// </summary>
@@ -104,11 +104,11 @@ namespace {{packageName}}.Client
         /// The raw content
         /// </summary>
         public string RawContent { get;}
-        
+
         #endregion Properties
-        
+
         #region Constructors
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiResponse{T}" /> class.
         /// </summary>

modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache

@@ -45,7 +45,7 @@ namespace {{packageName}}.Client
         }
 
         /// <summary>
-        /// Convert params to key/value pairs. 
+        /// Convert params to key/value pairs.
         /// Use collectionFormat to properly format lists and collections.
         /// </summary>
         /// <param name="collectionFormat">The swagger-supported collection format, one of: csv, tsv, ssv, pipes, multi</param>
@@ -70,7 +70,7 @@ namespace {{packageName}}.Client
 
             return parameters;
         }
-        
+
         /// <summary>
         /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime.
         /// If parameter is a list, join the list with ",".

modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache

@@ -212,7 +212,7 @@ namespace {{packageName}}.Client
             {
                 return apiKeyPrefix + " " + apiKeyValue;
             }
-            
+
             return apiKeyValue;
         }
 
@@ -224,7 +224,7 @@ namespace {{packageName}}.Client
 
         /// <summary>
         /// Gets or sets the access token for OAuth2 authentication.
-        /// 
+        ///
         /// This helper property simplifies code generation.
         /// </summary>
         /// <value>The access token.</value>
@@ -294,13 +294,13 @@ namespace {{packageName}}.Client
         /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
         ///
         /// Whatever you set here will be prepended to the value defined in AddApiKey.
-        /// 
+        ///
         /// An example invocation here might be:
         /// <example>
         /// ApiKeyPrefix["Authorization"] = "Bearer";
         /// </example>
         /// … where ApiKey["Authorization"] would then be used to set the value of your bearer token.
-        /// 
+        ///
         /// <remarks>
         /// OAuth2 workflows should set tokens via AccessToken.
         /// </remarks>
@@ -394,11 +394,11 @@ namespace {{packageName}}.Client
         public static IReadableConfiguration MergeConfigurations(IReadableConfiguration first, IReadableConfiguration second)
         {
             if (second == null) return first ?? GlobalConfiguration.Instance;
-            
+
             Dictionary<string, string> apiKey = first.ApiKey.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
             Dictionary<string, string> apiKeyPrefix = first.ApiKeyPrefix.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
             Dictionary<string, string> defaultHeaders = first.DefaultHeaders.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-            
+
             foreach (var kvp in second.ApiKey) apiKey[kvp.Key] = kvp.Value;
             foreach (var kvp in second.ApiKeyPrefix) apiKeyPrefix[kvp.Key] = kvp.Value;
             foreach (var kvp in second.DefaultHeaders) defaultHeaders[kvp.Key] = kvp.Value;

modules/openapi-generator/src/main/resources/csharp-netcore/IApiAccessor.mustache

@@ -20,7 +20,7 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <value>The base path</value>
         String GetBasePath();
-        
+
         /// <summary>
         /// Provides a factory method hook for the creation of exceptions.
         /// </summary>

modules/openapi-generator/src/main/resources/csharp-netcore/IAsynchronousClient.mustache

@@ -8,7 +8,7 @@ namespace {{packageName}}.Client
 {
     /// <summary>
     /// Contract for Asynchronous RESTful API interactions.
-    /// 
+    ///
     /// This interface allows consumers to provide a custom API accessor client.
     /// </summary>
     public interface IAsynchronousClient
@@ -23,7 +23,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> GetAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the POST http verb.
         /// </summary>
@@ -34,7 +34,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> PostAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the PUT http verb.
         /// </summary>
@@ -45,7 +45,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> PutAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the DELETE http verb.
         /// </summary>
@@ -56,7 +56,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> DeleteAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the HEAD http verb.
         /// </summary>
@@ -67,7 +67,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> HeadAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the OPTIONS http verb.
         /// </summary>
@@ -78,7 +78,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
         Task<ApiResponse<T>> OptionsAsync<T>(String path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-        
+
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the PATCH http verb.
         /// </summary>

modules/openapi-generator/src/main/resources/csharp-netcore/ISynchronousClient.mustache

@@ -7,7 +7,7 @@ namespace {{packageName}}.Client
 {
     /// <summary>
     /// Contract for Synchronous RESTful API interactions.
-    /// 
+    ///
     /// This interface allows consumers to provide a custom API accessor client.
     /// </summary>
     public interface ISynchronousClient
@@ -21,7 +21,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Get<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the POST http verb.
         /// </summary>
@@ -31,7 +31,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Post<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the PUT http verb.
         /// </summary>
@@ -41,7 +41,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Put<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the DELETE http verb.
         /// </summary>
@@ -51,7 +51,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Delete<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the HEAD http verb.
         /// </summary>
@@ -61,7 +61,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Head<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the OPTIONS http verb.
         /// </summary>
@@ -71,7 +71,7 @@ namespace {{packageName}}.Client
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Options<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
-        
+
         /// <summary>
         /// Executes a blocking call to some <paramref name="path"/> using the PATCH http verb.
         /// </summary>
@@ -82,4 +82,4 @@ namespace {{packageName}}.Client
         /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
         ApiResponse<T> Patch<T>(String path, RequestOptions options, IReadableConfiguration configuration = null);
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache

@@ -24,9 +24,11 @@ namespace {{packageName}}.{{apiPackage}}
         /// <summary>
         /// {{summary}}
         /// </summary>
+        {{#notes}}
         /// <remarks>
         /// {{notes}}
         /// </remarks>
+        {{/notes}}
         /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
         {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>{{#returnType}}{{returnType}}{{/returnType}}</returns>
@@ -244,7 +246,7 @@ namespace {{packageName}}.{{apiPackage}}
 
             String[] _contentTypes = new String[] {
                 {{#consumes}}
-                "{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}
+                "{{{mediaType}}}"{{#hasMore}},{{/hasMore}}
                 {{/consumes}}
             };
 
@@ -436,7 +438,7 @@ namespace {{packageName}}.{{apiPackage}}
 
             var localVarAccept = {{packageName}}.Client.ClientUtils.SelectHeaderAccept(_accepts);
             if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
-            
+
             {{#pathParams}}
             {{#required}}
             localVarRequestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter

modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache

@@ -93,7 +93,7 @@
             {{/isInherited}}
             {{/vars}}
         }
-        
+
         {{#vars}}
         {{^isInherited}}
         {{^isEnum}}
@@ -125,7 +125,7 @@
             sb.Append("}\n");
             return sb.ToString();
         }
-  
+
         /// <summary>
         /// Returns the JSON string presentation of the object
         /// </summary>

modules/openapi-generator/src/main/resources/csharp-netcore/partial_header.mustache

@@ -1,4 +1,4 @@
-/* 
+/*
  {{#appName}}
  * {{{appName}}}
  *
@@ -7,7 +7,11 @@
  * {{{appDescription}}}
  *
  {{/appDescription}}
- * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}}
- * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ {{#version}}
+ * The version of the OpenAPI document: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs

@@ -1,10 +1,9 @@
-/* 
+/*
  * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * The version of the OpenAPI document: 1.0.0
- * 
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
 
@@ -300,7 +299,7 @@ public Org.OpenAPITools.Client.ApiResponse< ModelClient > Call123TestSpecialTags
 
             var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts);
             if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
-            
+
             localVarRequestOptions.Data = modelClient;