Skip to content

Commit 9452873

Browse files
alfredo-accurisalfredo-accuris
authored
[csharp] Mustache fully qualify namespace for Path (#19349)
* fix: csharp mustash fully qualify namespace Path The generated code of Csharp get a fully quallify namespace for PATH using Path = global::System.IO.Path; * mend * Remove alias for fully qualify Path class
1 parent b627e1c commit 9452873

File tree

12 files changed

+24
-24
lines changed
  • modules/openapi-generator/src/main/resources/csharp
  • samples/client
    • echo_api/csharp-restsharp/src/Org.OpenAPITools/Client
    • others/csharp-complex-files/src/Org.OpenAPITools/Client
    • petstore/csharp/restsharp

12 files changed

+24
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ namespace {{packageName}}.Client
109109
if (response.Headers != null)
110110
{
111111
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
112-
? Path.GetTempPath()
112+
? global::System.IO.Path.GetTempPath()
113113
: _configuration.TempFolderPath;
114114
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
115115
foreach (var header in response.Headers)
@@ -377,7 +377,7 @@ namespace {{packageName}}.Client
377377
var bytes = ClientUtils.ReadAsBytes(file);
378378
var fileStream = file as FileStream;
379379
if (fileStream != null)
380-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
380+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
381381
else
382382
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
383383
}

‎samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ internal object Deserialize(RestResponse response, Type type)
110110
if (response.Headers != null)
111111
{
112112
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
113-
? Path.GetTempPath()
113+
? global::System.IO.Path.GetTempPath()
114114
: _configuration.TempFolderPath;
115115
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
116116
foreach (var header in response.Headers)
@@ -377,7 +377,7 @@ private RestRequest NewRequest(
377377
var bytes = ClientUtils.ReadAsBytes(file);
378378
var fileStream = file as FileStream;
379379
if (fileStream != null)
380-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
380+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
381381
else
382382
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
383383
}

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ internal object Deserialize(RestResponse response, Type type)
110110
if (response.Headers != null)
111111
{
112112
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
113-
? Path.GetTempPath()
113+
? global::System.IO.Path.GetTempPath()
114114
: _configuration.TempFolderPath;
115115
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
116116
foreach (var header in response.Headers)
@@ -377,7 +377,7 @@ private RestRequest NewRequest(
377377
var bytes = ClientUtils.ReadAsBytes(file);
378378
var fileStream = file as FileStream;
379379
if (fileStream != null)
380-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
380+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
381381
else
382382
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
383383
}

‎samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ internal object Deserialize(RestResponse response, Type type)
111111
if (response.Headers != null)
112112
{
113113
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
114-
? Path.GetTempPath()
114+
? global::System.IO.Path.GetTempPath()
115115
: _configuration.TempFolderPath;
116116
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
117117
foreach (var header in response.Headers)
@@ -378,7 +378,7 @@ private RestRequest NewRequest(
378378
var bytes = ClientUtils.ReadAsBytes(file);
379379
var fileStream = file as FileStream;
380380
if (fileStream != null)
381-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
381+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
382382
else
383383
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
384384
}

‎samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ internal object Deserialize(RestResponse response, Type type)
111111
if (response.Headers != null)
112112
{
113113
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
114-
? Path.GetTempPath()
114+
? global::System.IO.Path.GetTempPath()
115115
: _configuration.TempFolderPath;
116116
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
117117
foreach (var header in response.Headers)
@@ -378,7 +378,7 @@ private RestRequest NewRequest(
378378
var bytes = ClientUtils.ReadAsBytes(file);
379379
var fileStream = file as FileStream;
380380
if (fileStream != null)
381-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
381+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
382382
else
383383
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
384384
}

‎samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ internal object Deserialize(RestResponse response, Type type)
111111
if (response.Headers != null)
112112
{
113113
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
114-
? Path.GetTempPath()
114+
? global::System.IO.Path.GetTempPath()
115115
: _configuration.TempFolderPath;
116116
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
117117
foreach (var header in response.Headers)
@@ -378,7 +378,7 @@ private RestRequest NewRequest(
378378
var bytes = ClientUtils.ReadAsBytes(file);
379379
var fileStream = file as FileStream;
380380
if (fileStream != null)
381-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
381+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
382382
else
383383
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
384384
}

‎samples/client/petstore/csharp/restsharp/net6/ParameterMappings/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ internal object Deserialize(RestResponse response, Type type)
109109
if (response.Headers != null)
110110
{
111111
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
112-
? Path.GetTempPath()
112+
? global::System.IO.Path.GetTempPath()
113113
: _configuration.TempFolderPath;
114114
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
115115
foreach (var header in response.Headers)
@@ -376,7 +376,7 @@ private RestRequest NewRequest(
376376
var bytes = ClientUtils.ReadAsBytes(file);
377377
var fileStream = file as FileStream;
378378
if (fileStream != null)
379-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
379+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
380380
else
381381
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
382382
}

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ internal object Deserialize(RestResponse response, Type type)
110110
if (response.Headers != null)
111111
{
112112
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
113-
? Path.GetTempPath()
113+
? global::System.IO.Path.GetTempPath()
114114
: _configuration.TempFolderPath;
115115
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
116116
foreach (var header in response.Headers)
@@ -377,7 +377,7 @@ private RestRequest NewRequest(
377377
var bytes = ClientUtils.ReadAsBytes(file);
378378
var fileStream = file as FileStream;
379379
if (fileStream != null)
380-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
380+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
381381
else
382382
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
383383
}

‎samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ internal object Deserialize(RestResponse response, Type type)
110110
if (response.Headers != null)
111111
{
112112
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
113-
? Path.GetTempPath()
113+
? global::System.IO.Path.GetTempPath()
114114
: _configuration.TempFolderPath;
115115
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
116116
foreach (var header in response.Headers)
@@ -377,7 +377,7 @@ private RestRequest NewRequest(
377377
var bytes = ClientUtils.ReadAsBytes(file);
378378
var fileStream = file as FileStream;
379379
if (fileStream != null)
380-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
380+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
381381
else
382382
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
383383
}

‎samples/client/petstore/csharp/restsharp/net7/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ internal object Deserialize(RestResponse response, Type type)
109109
if (response.Headers != null)
110110
{
111111
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
112-
? Path.GetTempPath()
112+
? global::System.IO.Path.GetTempPath()
113113
: _configuration.TempFolderPath;
114114
var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
115115
foreach (var header in response.Headers)
@@ -376,7 +376,7 @@ private RestRequest NewRequest(
376376
var bytes = ClientUtils.ReadAsBytes(file);
377377
var fileStream = file as FileStream;
378378
if (fileStream != null)
379-
request.AddFile(fileParam.Key, bytes, Path.GetFileName(fileStream.Name));
379+
request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name));
380380
else
381381
request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
382382
}

0 commit comments

Comments
 (0)