Skip to content

Commit

Permalink
[csharp] Reference this.Configuration in client api template (swagger…
Browse files Browse the repository at this point in the history 
…-api#7394)

* [csharp] this.Configuration in api template

Unprefixed Configuration property access leads to ambiguous references
when spec defines a Configuration model.

* [csharp] Regenerate samples
  • Loading branch information
@jimschubert @viclovsky
jimschubert authored and viclovsky committed Jan 23, 2018
1 parent 22362a4 commit ff418fb
Show file tree
Hide file tree
Showing 81 changed files with 2,142 additions and 2,127 deletions.
80 changes: 40 additions & 40 deletions modules/swagger-codegen/src/main/resources/csharp/api.mustache
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/SwaggerClient/.swagger-codegen/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0-SNAPSHOT
2.3.1-SNAPSHOT
12 changes: 6 additions & 6 deletions samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,11 @@ namespace Example
public void main()
{
var apiInstance = new FakeApi();
var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)
var enumFormStringArray = enumFormStringArray_example; // List<string> | Form parameter enum test (string array) (optional)
var enumFormString = enumFormString_example; // string | Form parameter enum test (string) (optional) (default to -efg)
var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional)
var enumHeaderStringArray = enumHeaderStringArray_example; // List<string> | Header parameter enum test (string array) (optional)
var enumHeaderString = enumHeaderString_example; // string | Header parameter enum test (string) (optional) (default to -efg)
var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional)
var enumQueryStringArray = enumQueryStringArray_example; // List<string> | Query parameter enum test (string array) (optional)
var enumQueryString = enumQueryString_example; // string | Query parameter enum test (string) (optional) (default to -efg)
var enumQueryInteger = 56; // int? | Query parameter enum test (double) (optional)
var enumQueryDouble = 1.2; // double? | Query parameter enum test (double) (optional)
Expand All @@ -456,11 +456,11 @@ namespace Example

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**enumFormStringArray** | [**List&lt;string&gt;**](string.md)| Form parameter enum test (string array) | [optional]
**enumFormStringArray** | **List&lt;string&gt;**| Form parameter enum test (string array) | [optional]
**enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg]
**enumHeaderStringArray** | [**List&lt;string&gt;**](string.md)| Header parameter enum test (string array) | [optional]
**enumHeaderStringArray** | **List&lt;string&gt;**| Header parameter enum test (string array) | [optional]
**enumHeaderString** | **string**| Header parameter enum test (string) | [optional] [default to -efg]
**enumQueryStringArray** | [**List&lt;string&gt;**](string.md)| Query parameter enum test (string array) | [optional]
**enumQueryStringArray** | **List&lt;string&gt;**| Query parameter enum test (string array) | [optional]
**enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg]
**enumQueryInteger** | **int?**| Query parameter enum test (double) | [optional]
**enumQueryDouble** | **double?**| Query parameter enum test (double) | [optional]
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/csharp/SwaggerClient/docs/PetApi.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ namespace Example
Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";

var apiInstance = new PetApi();
var status = new List<string>(); // List<string> | Status values that need to be considered for filter
var status = status_example; // List<string> | Status values that need to be considered for filter
try
{
Expand All @@ -185,7 +185,7 @@ namespace Example

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**status** | [**List&lt;string&gt;**](string.md)| Status values that need to be considered for filter |
**status** | **List&lt;string&gt;**| Status values that need to be considered for filter |

### Return type

Expand Down
32 changes: 16 additions & 16 deletions samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/AnotherFakeApi.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public partial class AnotherFakeApi : IAnotherFakeApi
/// <returns></returns>
public AnotherFakeApi(String basePath)
{
this.Configuration = new Configuration { BasePath = basePath };
this.Configuration = new IO.Swagger.Client.Configuration { BasePath = basePath };

ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
}
Expand All @@ -95,10 +95,10 @@ public AnotherFakeApi(String basePath)
/// </summary>
/// <param name="configuration">An instance of Configuration</param>
/// <returns></returns>
public AnotherFakeApi(Configuration configuration = null)
public AnotherFakeApi(IO.Swagger.Client.Configuration configuration = null)
{
if (configuration == null) // use the default one in Configuration
this.Configuration = Configuration.Default;
this.Configuration = IO.Swagger.Client.Configuration.Default;
else
this.Configuration = configuration;

Expand Down Expand Up @@ -128,7 +128,7 @@ public void SetBasePath(String basePath)
/// Gets or sets the configuration object
/// </summary>
/// <value>An instance of the Configuration</value>
public Configuration Configuration {get; set;}
public IO.Swagger.Client.Configuration Configuration {get; set;}

/// <summary>
/// Provides a factory method hook for the creation of exceptions.
Expand Down Expand Up @@ -195,7 +195,7 @@ public ModelClient TestSpecialTags (ModelClient body)
var localVarPath = "/another-fake/dummy";
var localVarPathParams = new Dictionary<String, String>();
var localVarQueryParams = new List<KeyValuePair<String, String>>();
var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
var localVarFormParams = new Dictionary<String, String>();
var localVarFileParams = new Dictionary<String, FileParameter>();
Object localVarPostBody = null;
Expand All @@ -204,19 +204,19 @@ public ModelClient TestSpecialTags (ModelClient body)
String[] localVarHttpContentTypes = new String[] {
"application/json"
};
String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);

// to determine the Accept header
String[] localVarHttpHeaderAccepts = new String[] {
"application/json"
};
String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
if (localVarHttpHeaderAccept != null)
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);

if (body != null && body.GetType() != typeof(byte[]))
{
localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
}
else
{
Expand All @@ -225,7 +225,7 @@ public ModelClient TestSpecialTags (ModelClient body)


// make the HTTP request
IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);

Expand All @@ -239,7 +239,7 @@ public ModelClient TestSpecialTags (ModelClient body)

return new ApiResponse<ModelClient>(localVarStatusCode,
localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
(ModelClient) Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
(ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
}

/// <summary>
Expand Down Expand Up @@ -270,7 +270,7 @@ public async System.Threading.Tasks.Task<ApiResponse<ModelClient>> TestSpecialTa
var localVarPath = "/another-fake/dummy";
var localVarPathParams = new Dictionary<String, String>();
var localVarQueryParams = new List<KeyValuePair<String, String>>();
var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
var localVarFormParams = new Dictionary<String, String>();
var localVarFileParams = new Dictionary<String, FileParameter>();
Object localVarPostBody = null;
Expand All @@ -279,19 +279,19 @@ public async System.Threading.Tasks.Task<ApiResponse<ModelClient>> TestSpecialTa
String[] localVarHttpContentTypes = new String[] {
"application/json"
};
String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);

// to determine the Accept header
String[] localVarHttpHeaderAccepts = new String[] {
"application/json"
};
String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
if (localVarHttpHeaderAccept != null)
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);

if (body != null && body.GetType() != typeof(byte[]))
{
localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
localVarPostBody = this.Configuration.ApiClient.Serialize(body); // http body (model) parameter
}
else
{
Expand All @@ -300,7 +300,7 @@ public async System.Threading.Tasks.Task<ApiResponse<ModelClient>> TestSpecialTa


// make the HTTP request
IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
Method.PATCH, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);

Expand All @@ -314,7 +314,7 @@ public async System.Threading.Tasks.Task<ApiResponse<ModelClient>> TestSpecialTa

return new ApiResponse<ModelClient>(localVarStatusCode,
localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
(ModelClient) Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
(ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
}

}
Expand Down

0 comments on commit ff418fb

Please sign in to comment.