Merge pull request #2 from OpenAPITools/master

Merge master

Author: ksvirkou-hubspot

bin/configs/csharp-generichost-latest-dateTimeOffset.yaml

@@ -8,3 +8,5 @@ additionalProperties:
   modelPropertySorting: alphabetical
   operationParameterSorting: alphabetical
   useDateTimeOffset: true
+  treatWarningsAsErrors: true
+  warningsNotAsErrors: CS0612

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

@@ -388,7 +388,7 @@ namespace {{packageName}}.{{apiPackage}}
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "{{{path}}}"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "{{{path}}}");
                     {{/servers}}
                     {{#servers}}
                     {{#-first}}

modules/openapi-generator/src/main/resources/php-nextgen/model.mustache

@@ -21,14 +21,14 @@
 
 namespace {{modelPackage}};
 {{^isEnum}}
-{{^parentSchema}}
 
+{{^parentSchema}}
 use ArrayAccess;
 use JsonSerializable;
+{{/parentSchema}}
 use InvalidArgumentException;
 use ReturnTypeWillChange;
 use {{invokerPackage}}\ObjectSerializer;
-{{/parentSchema}}
 {{/isEnum}}
 
 /**

samples/client/echo_api/php-nextgen-streaming/src/Model/DataQuery.php

@@ -28,6 +28,10 @@
 
 namespace OpenAPI\Client\Model;
 
+use InvalidArgumentException;
+use ReturnTypeWillChange;
+use OpenAPI\Client\ObjectSerializer;
+
 /**
  * DataQuery Class Doc Comment
  *

samples/client/echo_api/php-nextgen/src/Model/DataQuery.php

@@ -28,6 +28,10 @@
 
 namespace OpenAPI\Client\Model;
 
+use InvalidArgumentException;
+use ReturnTypeWillChange;
+use OpenAPI\Client\ObjectSerializer;
+
 /**
  * DataQuery Class Doc Comment
  *

samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs

@@ -246,7 +246,7 @@ public async Task<IHelloWorldPostApiResponse> HelloWorldPostAsync(Option<HelloWo
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "/helloWorld"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/helloWorld");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/helloWorld");
 
                     if (helloWorldPostRequest.IsSet)
                         httpRequestMessageLocalVar.Content = (helloWorldPostRequest.Value as object) is System.IO.Stream stream

samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs

@@ -240,7 +240,7 @@ public async Task<IIconsApiResponse> IconsAsync(Option<IconsSizeParameter> size
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "/icons"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/icons");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/icons");
 
                     System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);
 

samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs

@@ -227,7 +227,7 @@ public async Task<IOneOfArrayApiResponse> OneOfArrayAsync(Option<OneOfArrayReque
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "/one-of-array"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/one-of-array");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/one-of-array");
 
                     if (oneOfArrayRequest.IsSet)
                         httpRequestMessageLocalVar.Content = (oneOfArrayRequest.Value as object) is System.IO.Stream stream

samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs

@@ -234,7 +234,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "/api_keys/{id}"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
                     uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
 
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs

@@ -222,7 +222,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
                     uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
                     uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
                         ? "/api_keys/{id}"
-                        : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
+                        : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
                     uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
 
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;