loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[csharp] fixes for netstandard (json serializing and project files) (#5590)

Browse Source
This commit is contained in:
Voydz 2017-05-10 09:24:43 +02:00 committed by wing328
parent fd3cae6c4b
commit 5a257a0558
9 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
View File

@ -122,6 +122,10 @@ namespace {{packageName}}.Client
String contentType) String contentType)
{ {
var request = new RestRequest(path, method); var request = new RestRequest(path, method);
{{#netStandard}}
// disable ResetSharp.Portable built-in serialization
request.Serializer = null;
{{/netStandard}}
// add path parameter, if any // add path parameter, if any
foreach(var param in pathParams) foreach(var param in pathParams)
@ -161,11 +165,21 @@ namespace {{packageName}}.Client
{ {
if (postBody.GetType() == typeof(String)) if (postBody.GetType() == typeof(String))
{ {
{{#netStandard}}
request.AddParameter(new Parameter { Value = postBody, Type = ParameterType.RequestBody, ContentType = "application/json" });
{{/netStandard}}
{{^netStandard}}
request.AddParameter("application/json", postBody, ParameterType.RequestBody); request.AddParameter("application/json", postBody, ParameterType.RequestBody);
{{/netStandard}}
} }
else if (postBody.GetType() == typeof(byte[])) else if (postBody.GetType() == typeof(byte[]))
{ {
{{#netStandard}}
request.AddParameter(new Parameter { Value = postBody, Type = ParameterType.RequestBody, ContentType = contentType });
{{/netStandard}}
{{^netStandard}}
request.AddParameter(contentType, postBody, ParameterType.RequestBody); request.AddParameter(contentType, postBody, ParameterType.RequestBody);
{{/netStandard}}
} }
} }

5
modules/swagger-codegen/src/main/resources/csharp/Project.mustache
View File

@ -88,7 +88,10 @@
{{/netStandard}} {{/netStandard}}
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs"/> <Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
</ItemGroup> </ItemGroup>
{{^netStandard}} {{^netStandard}}
<ItemGroup> <ItemGroup>

6
samples/client/petstore-security-test/csharp/SwaggerClient/src/IO.Swagger/Api/FakeApi.cs
View File

@ -216,7 +216,7 @@ namespace IO.Swagger.Api
// to determine the Accept header // to determine the Accept header
String[] localVarHttpHeaderAccepts = new String[] { String[] localVarHttpHeaderAccepts = new String[] {
"application/json", "application/json",
"*_/ ' =end - - " "*_/ ' =end - - "
}; };
String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts); String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
@ -239,7 +239,6 @@ namespace IO.Swagger.Api
if (exception != null) throw exception; if (exception != null) throw exception;
} }
return new ApiResponse<Object>(localVarStatusCode, return new ApiResponse<Object>(localVarStatusCode,
localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()), localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
null); null);
@ -283,7 +282,7 @@ namespace IO.Swagger.Api
// to determine the Accept header // to determine the Accept header
String[] localVarHttpHeaderAccepts = new String[] { String[] localVarHttpHeaderAccepts = new String[] {
"application/json", "application/json",
"*_/ ' =end - - " "*_/ ' =end - - "
}; };
String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts); String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
@ -306,7 +305,6 @@ namespace IO.Swagger.Api
if (exception != null) throw exception; if (exception != null) throw exception;
} }
return new ApiResponse<Object>(localVarStatusCode, return new ApiResponse<Object>(localVarStatusCode,
localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()), localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
null); null);

5
samples/client/petstore-security-test/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
View File

@ -62,7 +62,10 @@ Contact: apiteam@swagger.io *_/ ' \" =end - - \\r\\n \\n \\r
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs"/> <Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

2
samples/client/petstore-security-test/csharp/SwaggerClient/src/IO.Swagger/Model/ModelReturn.cs
View File

@ -119,7 +119,7 @@ namespace IO.Swagger.Model
/// <param name="validationContext">Validation context</param> /// <param name="validationContext">Validation context</param>
/// <returns>Validation Result</returns> /// <returns>Validation Result</returns>
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext) IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
{ {
yield break; yield break;
} }
} }

5
samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
View File

@ -62,7 +62,10 @@ Contact: apiteam@swagger.io
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs"/> <Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

6
samples/client/petstore/csharp/SwaggerClientNetStandard/src/IO.Swagger/Client/ApiClient.cs
View File

@ -115,6 +115,8 @@ namespace IO.Swagger.Client
String contentType) String contentType)
{ {
var request = new RestRequest(path, method); var request = new RestRequest(path, method);
// disable ResetSharp.Portable built-in serialization
request.Serializer = null;
// add path parameter, if any // add path parameter, if any
foreach(var param in pathParams) foreach(var param in pathParams)
@ -142,11 +144,11 @@ namespace IO.Swagger.Client
{ {
if (postBody.GetType() == typeof(String)) if (postBody.GetType() == typeof(String))
{ {
request.AddParameter("application/json", postBody, ParameterType.RequestBody); request.AddParameter(new Parameter { Value = postBody, Type = ParameterType.RequestBody, ContentType = "application/json" });
} }
else if (postBody.GetType() == typeof(byte[])) else if (postBody.GetType() == typeof(byte[]))
{ {
request.AddParameter(contentType, postBody, ParameterType.RequestBody); request.AddParameter(new Parameter { Value = postBody, Type = ParameterType.RequestBody, ContentType = contentType });
} }
} }

5
samples/client/petstore/csharp/SwaggerClientNetStandard/src/IO.Swagger/IO.Swagger.csproj
View File

@ -43,7 +43,10 @@ Contact: apiteam@swagger.io
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs"/> <Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

5
samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.csproj
View File

@ -64,7 +64,10 @@ Contact: apiteam@swagger.io
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs"/> <Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />