Fix issue with C# generator when the model name is "File" (#1428)

* fix get schema type in abstract c# class

* update c# petstore sample
This commit is contained in:
William Cheng
2018-11-14 09:43:31 +08:00
committed by GitHub
parent c8837ea414
commit efde4a8eb8
27 changed files with 1023 additions and 38 deletions

View File

@@ -1 +1 @@
3.3.2-SNAPSHOT
3.3.3-SNAPSHOT

View File

@@ -106,6 +106,7 @@ Class | Method | HTTP request | Description
*FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
*FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
*FakeApi* | [**TestEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
*FakeApi* | [**TestGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
*FakeApi* | [**TestInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
*FakeApi* | [**TestJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
*FakeClassnameTags123Api* | [**TestClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case

View File

@@ -13,6 +13,7 @@ Method | HTTP request | Description
[**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
[**TestEndpointParameters**](FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
[**TestEnumParameters**](FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
[**TestGroupParameters**](FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
[**TestInlineAdditionalProperties**](FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
[**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
@@ -600,6 +601,76 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
<a name="testgroupparameters"></a>
# **TestGroupParameters**
> void TestGroupParameters (int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
Fake endpoint to test group parameters (optional)
Fake endpoint to test group parameters (optional)
### Example
```csharp
using System;
using System.Diagnostics;
using Org.OpenAPITools.Api;
using Org.OpenAPITools.Client;
using Org.OpenAPITools.Model;
namespace Example
{
public class TestGroupParametersExample
{
public void main()
{
var apiInstance = new FakeApi();
var requiredStringGroup = 56; // int? | Required String in group parameters
var requiredBooleanGroup = true; // bool? | Required Boolean in group parameters
var requiredInt64Group = 789; // long? | Required Integer in group parameters
var stringGroup = 56; // int? | String in group parameters (optional)
var booleanGroup = true; // bool? | Boolean in group parameters (optional)
var int64Group = 789; // long? | Integer in group parameters (optional)
try
{
// Fake endpoint to test group parameters (optional)
apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
}
catch (Exception e)
{
Debug.Print("Exception when calling FakeApi.TestGroupParameters: " + e.Message );
}
}
}
}
```
### Parameters
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**requiredStringGroup** | **int?**| Required String in group parameters |
**requiredBooleanGroup** | **bool?**| Required Boolean in group parameters |
**requiredInt64Group** | **long?**| Required Integer in group parameters |
**stringGroup** | **int?**| String in group parameters | [optional]
**booleanGroup** | **bool?**| Boolean in group parameters | [optional]
**int64Group** | **long?**| Integer in group parameters | [optional]
### Return type
void (empty response body)
### Authorization
No authorization required
### HTTP request headers
- **Content-Type**: Not defined
- **Accept**: Not defined
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
<a name="testinlineadditionalproperties"></a>
# **TestInlineAdditionalProperties**
> void TestInlineAdditionalProperties (Dictionary<string, string> requestBody)

View File

@@ -3,8 +3,8 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**File** | **System.IO.Stream** | | [optional]
**Files** | **List&lt;System.IO.Stream&gt;** | | [optional]
**File** | [**File**](File.md) | | [optional]
**Files** | [**List&lt;File&gt;**](File.md) | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

View File

@@ -256,6 +256,37 @@ namespace Org.OpenAPITools.Api
/// <returns>ApiResponse of Object(void)</returns>
ApiResponse<Object> TestEnumParametersWithHttpInfo (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null);
/// <summary>
/// Fake endpoint to test group parameters (optional)
/// </summary>
/// <remarks>
/// Fake endpoint to test group parameters (optional)
/// </remarks>
/// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
/// <param name="requiredStringGroup">Required String in group parameters</param>
/// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
/// <param name="requiredInt64Group">Required Integer in group parameters</param>
/// <param name="stringGroup">String in group parameters (optional)</param>
/// <param name="booleanGroup">Boolean in group parameters (optional)</param>
/// <param name="int64Group">Integer in group parameters (optional)</param>
/// <returns></returns>
void TestGroupParameters (int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null);
/// <summary>
/// Fake endpoint to test group parameters (optional)
/// </summary>
/// <remarks>
/// Fake endpoint to test group parameters (optional)
/// </remarks>
/// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
/// <param name="requiredStringGroup">Required String in group parameters</param>
/// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
/// <param name="requiredInt64Group">Required Integer in group parameters</param>
/// <param name="stringGroup">String in group parameters (optional)</param>
/// <param name="booleanGroup">Boolean in group parameters (optional)</param>
/// <param name="int64Group">Integer in group parameters (optional)</param>
/// <returns>ApiResponse of Object(void)</returns>
ApiResponse<Object> TestGroupParametersWithHttpInfo (int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null);
/// <summary>
/// test inline additionalProperties
/// </summary>
/// <remarks>
@@ -1116,6 +1147,91 @@ namespace Org.OpenAPITools.Api
null);
}
/// <summary>
/// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
/// </summary>
/// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
/// <param name="requiredStringGroup">Required String in group parameters</param>
/// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
/// <param name="requiredInt64Group">Required Integer in group parameters</param>
/// <param name="stringGroup">String in group parameters (optional)</param>
/// <param name="booleanGroup">Boolean in group parameters (optional)</param>
/// <param name="int64Group">Integer in group parameters (optional)</param>
/// <returns></returns>
public void TestGroupParameters (int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
{
TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
}
/// <summary>
/// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
/// </summary>
/// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
/// <param name="requiredStringGroup">Required String in group parameters</param>
/// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
/// <param name="requiredInt64Group">Required Integer in group parameters</param>
/// <param name="stringGroup">String in group parameters (optional)</param>
/// <param name="booleanGroup">Boolean in group parameters (optional)</param>
/// <param name="int64Group">Integer in group parameters (optional)</param>
/// <returns>ApiResponse of Object(void)</returns>
public ApiResponse<Object> TestGroupParametersWithHttpInfo (int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
{
// verify the required parameter 'requiredStringGroup' is set
if (requiredStringGroup == null)
throw new ApiException(400, "Missing required parameter 'requiredStringGroup' when calling FakeApi->TestGroupParameters");
// verify the required parameter 'requiredBooleanGroup' is set
if (requiredBooleanGroup == null)
throw new ApiException(400, "Missing required parameter 'requiredBooleanGroup' when calling FakeApi->TestGroupParameters");
// verify the required parameter 'requiredInt64Group' is set
if (requiredInt64Group == null)
throw new ApiException(400, "Missing required parameter 'requiredInt64Group' when calling FakeApi->TestGroupParameters");
var localVarPath = "/fake";
var localVarPathParams = new Dictionary<String, String>();
var localVarQueryParams = new List<KeyValuePair<String, String>>();
var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
var localVarFormParams = new Dictionary<String, String>();
var localVarFileParams = new Dictionary<String, FileParameter>();
Object localVarPostBody = null;
// to determine the Content-Type header
String[] localVarHttpContentTypes = new String[] {
};
String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
// to determine the Accept header
String[] localVarHttpHeaderAccepts = new String[] {
};
String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
if (localVarHttpHeaderAccept != null)
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
if (requiredStringGroup != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "required_string_group", requiredStringGroup)); // query parameter
if (requiredInt64Group != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "required_int64_group", requiredInt64Group)); // query parameter
if (stringGroup != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "string_group", stringGroup)); // query parameter
if (int64Group != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "int64_group", int64Group)); // query parameter
if (requiredBooleanGroup != null) localVarHeaderParams.Add("required_boolean_group", this.Configuration.ApiClient.ParameterToString(requiredBooleanGroup)); // header parameter
if (booleanGroup != null) localVarHeaderParams.Add("boolean_group", this.Configuration.ApiClient.ParameterToString(booleanGroup)); // header parameter
// make the HTTP request
IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
if (ExceptionFactory != null)
{
Exception exception = ExceptionFactory("TestGroupParameters", localVarResponse);
if (exception != null) throw exception;
}
return new ApiResponse<Object>(localVarStatusCode,
localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
null);
}
/// <summary>
/// test inline additionalProperties
/// </summary>

View File

@@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model
/// </summary>
/// <param name="file">file.</param>
/// <param name="files">files.</param>
public FileSchemaTestClass(System.IO.Stream file = default(System.IO.Stream), List<System.IO.Stream> files = default(List<System.IO.Stream>))
public FileSchemaTestClass(File file = default(File), List<File> files = default(List<File>))
{
this.File = file;
this.Files = files;
@@ -45,13 +45,13 @@ namespace Org.OpenAPITools.Model
/// Gets or Sets File
/// </summary>
[DataMember(Name="file", EmitDefaultValue=false)]
public System.IO.Stream File { get; set; }
public File File { get; set; }
/// <summary>
/// Gets or Sets Files
/// </summary>
[DataMember(Name="files", EmitDefaultValue=false)]
public List<System.IO.Stream> Files { get; set; }
public List<File> Files { get; set; }
/// <summary>
/// Returns the string presentation of the object