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

various fixes to csharp refactor client (#1711)

Browse Source
This commit is contained in:
William Cheng
2018-12-20 16:06:29 +08:00
committed by GitHub
parent 9ff8a24895
commit 93c13074ff
44 changed files with 863 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -146,6 +146,8 @@ samples/client/petstore/csharp/SwaggerClient/bin/Debug/
samples/client/petstore/csharp/SwaggerClient/packages
samples/client/petstore/csharp/SwaggerClient/TestResult.xml
samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/IO.Swagger.userprefs
samples/client/petstore/csharp-refactor/OpenAPIClient/TestResult.xml
samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
# Python
*.pyc

91
CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj Normal file
View File

@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
OpenAPI Petstore
This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
OpenAPI spec version: 1.0.0
-->
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Org.OpenAPITools.Test</RootNamespace>
<AssemblyName>Org.OpenAPITools.Test</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs" Exclude="obj\**" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
<Project>{321C8C3F-0156-40C1-AE42-D59761FB9B6C}</Project>
<Name>Org.OpenAPITools</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="linux-logo.png" />
</ItemGroup>
</Project>

6
bin/csharp-refactor-petstore.sh
View File

@@ -27,11 +27,11 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o samples/client/petstore/csharp-refactor/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
ags="generate -t modules/openapi-generator/src/main/resources/csharp-refactor/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o samples/client/petstore/csharp-refactor/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
java $JAVA_OPTS -jar $executable $ags
# restore csproj file
#echo "restore csproject file: CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
#cp ./CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/
echo "restore csproject file: CI/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
cp ./CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/

8
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpRefactorClientCodegen.java
View File

@@ -49,7 +49,7 @@ import static org.openapitools.codegen.utils.StringUtils.underscore;
public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
@SuppressWarnings({"hiding"})
private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
private static final String NET45 = "v4.5";
private static final String NET45 = "v4.5.2";
private static final String NET40 = "v4.0";
private static final String NET35 = "v3.5";
// TODO: v5.0 is PCL, not netstandard version 1.3, and not a specific .NET Framework. This needs to be updated,
@@ -127,7 +127,7 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
frameworks = new ImmutableMap.Builder<String, String>()
.put(NET35, ".NET Framework 3.5 compatible")
.put(NET40, ".NET Framework 4.0 compatible")
.put(NET45, ".NET Framework 4.5+ compatible")
.put(NET45, ".NET Framework 4.5.2+ compatible")
.put(NETSTANDARD, ".NET Standard 1.3 compatible")
.put(UWP, "Universal Windows Platform (IMPORTANT: this will be decommissioned and replaced by v5.0)")
.build();
@@ -295,8 +295,10 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
setTargetFrameworkNuget("net40");
setSupportsAsync(Boolean.FALSE);
} else {
} else { // 4.5+
additionalProperties.put(MCS_NET_VERSION_KEY, "4.5.2-api");
// some libs need 452 isntead of 45 in the config
additionalProperties.put("isNet452", true);
setTargetFrameworkNuget("net45");
setSupportsAsync(Boolean.TRUE);
}

55
modules/openapi-generator/src/main/resources/csharp-refactor/ApiClient.mustache
View File

@@ -14,8 +14,11 @@ using System.Web;
{{/netStandard}}
using System.Linq;
using System.Net;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters;
using System.Text;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
{{#netStandard}}
using RestSharp.Portable;
using RestSharp.Portable.HttpClient;
@@ -23,6 +26,8 @@ using RestSharpMethod = RestSharp.Portable.Method;
{{/netStandard}}
{{^netStandard}}
using RestSharp;
using RestSharp.Deserializers;
using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
using RestSharpMethod = RestSharp.Method;
{{/netStandard}}
@@ -38,8 +43,15 @@ namespace {{packageName}}.Client
private string _contentType = "application/json";
private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
{
// Swagger generated types generally hide default constructors.
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
// OpenAPI generated types generally hide default constructors.
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
ContractResolver = new DefaultContractResolver
{
NamingStrategy = new CamelCaseNamingStrategy()
{
OverrideSpecifiedNames = true
}
}
};
public CustomJsonCodec(IReadableConfiguration configuration)
@@ -57,21 +69,14 @@ namespace {{packageName}}.Client
public string Serialize(object obj)
{
using (var writer = new StringWriter())
using (var jsonWriter = new JsonTextWriter(writer)
{
Formatting = Formatting.None,
DateFormatString = _configuration.DateTimeFormat
})
{
_serializer.Serialize(jsonWriter, obj);
return writer.ToString();
}
String result = JsonConvert.SerializeObject(obj, _serializerSettings);
return result;
}
public T Deserialize<T>(IRestResponse response)
{
return (T) Deserialize(response, typeof(T));
var result = (T) Deserialize(response, typeof(T));
return result;
}
/// <summary>
@@ -247,7 +252,11 @@ namespace {{packageName}}.Client
if (options == null) throw new ArgumentNullException("options");
if (configuration == null) throw new ArgumentNullException("configuration");
RestRequest request = new RestRequest(path, Method(method));
RestRequest request = new RestRequest(Method(method))
{
Resource = path,
JsonSerializer = new CustomJsonCodec(configuration)
};
if (options.PathParameters != null)
{
@@ -372,9 +381,19 @@ namespace {{packageName}}.Client
{
RestClient client = new RestClient(_baseUrl);
var codec = new CustomJsonCodec(configuration);
req.JsonSerializer = codec;
client.AddHandler(codec.ContentType, codec);
client.ClearHandlers();
var existingDeserializer = req.JsonSerializer as IDeserializer;
if (existingDeserializer != null)
{
client.AddHandler(existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
}
else
{
var codec = new CustomJsonCodec(configuration);
client.AddHandler(codec, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
}
client.AddHandler(new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
client.Timeout = configuration.Timeout;
@@ -382,7 +401,7 @@ namespace {{packageName}}.Client
{
client.UserAgent = configuration.UserAgent;
}
InterceptRequest(req);
{{#supportsAsync}}
var response = await client.ExecuteTaskAsync<T>(req);

59
modules/openapi-generator/src/main/resources/csharp-refactor/ClientUtils.mustache
View File

@@ -188,6 +188,61 @@ namespace {{packageName}}.Client
{{/supportsAsync}}
{
return Convert.ChangeType(fromObject, toObject);
}
}
/// <summary>
/// Select the Content-Type header's value from the given content-type array:
/// if JSON type exists in the given array, use it;
/// otherwise use the first one defined in 'consumes'
/// </summary>
/// <param name="contentTypes">The Content-Type array to select from.</param>
/// <returns>The Content-Type header to use.</returns>
public static String SelectHeaderContentType(String[] contentTypes)
{
if (contentTypes.Length == 0)
return "application/json";
foreach (var contentType in contentTypes)
{
if (IsJsonMime(contentType.ToLower()))
return contentType;
}
return contentTypes[0]; // use the first content type specified in 'consumes'
}
/// <summary>
/// Select the Accept header's value from the given accepts array:
/// if JSON exists in the given array, use it;
/// otherwise use all of them (joining into a string)
/// </summary>
/// <param name="accepts">The accepts array to select from.</param>
/// <returns>The Accept header to use.</returns>
public static String SelectHeaderAccept(String[] accepts)
{
if (accepts.Length == 0)
return null;
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
return "application/json";
return String.Join(",", accepts);
}
/// <summary>
/// Check if the given MIME is a JSON MIME.
/// JSON MIME examples:
/// application/json
/// application/json; charset=UTF8
/// APPLICATION/JSON
/// application/vnd.company+json
/// </summary>
/// <param name="mime">MIME</param>
/// <returns>Returns True if MIME type is json.</returns>
public static bool IsJsonMime(String mime)
{
var jsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
return mime != null && (jsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json"));
}
}
}
}

24
modules/openapi-generator/src/main/resources/csharp-refactor/Project.mustache
View File

@@ -67,22 +67,22 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
</Reference>
{{#generatePropertyChanged}}
<Reference Include="PropertyChanged">

24
modules/openapi-generator/src/main/resources/csharp-refactor/TestProject.mustache
View File

@@ -59,22 +59,22 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

14
modules/openapi-generator/src/main/resources/csharp-refactor/api.mustache
View File

@@ -243,13 +243,13 @@ namespace {{packageName}}.{{apiPackage}}
"{{{mediaType}}}"{{#hasMore}},{{/hasMore}}
{{/produces}}
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
{{#pathParams}}
if ({{paramName}} != null)
requestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter

6
modules/openapi-generator/src/main/resources/csharp-refactor/compile-mono.sh.mustache
View File

@@ -44,9 +44,9 @@ ${nuget_cmd} install src/{{packageName}}/packages.config -o packages;
echo "[INFO] Copy DLLs to the 'bin' folder"
mkdir -p bin;
cp packages/Newtonsoft.Json.10.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
cp packages/RestSharp.105.1.0/lib/{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}/RestSharp.dll bin/RestSharp.dll;
cp packages/JsonSubTypes.1.2.0/lib/{{targetFrameworkNuget}}/JsonSubTypes.dll bin/JsonSubTypes.dll
cp packages/Newtonsoft.Json.12.0.1/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
cp packages/RestSharp.106.5.4/lib/{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}/RestSharp.dll bin/RestSharp.dll;
cp packages/JsonSubTypes.1.5.1/lib/{{targetFrameworkNuget}}/JsonSubTypes.dll bin/JsonSubTypes.dll
{{#generatePropertyChanged}}
cp packages/Fody.1.29.4/Fody.dll bin/Fody.dll
cp packages/PropertyChanged.Fody.1.51.3/PropertyChanged.Fody.dll bin/PropertyChanged.Fody.dll

6
modules/openapi-generator/src/main/resources/csharp-refactor/compile.mustache
View File

@@ -15,9 +15,9 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient
if not exist ".\bin" mkdir bin
copy packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\JsonSubTypes.1.2.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll bin\JsonSubTypes.dll
copy packages\RestSharp.105.1.0\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll bin\RestSharp.dll
copy packages\Newtonsoft.Json.12.0.1\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\JsonSubTypes.1.5.1\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll bin\JsonSubTypes.dll
copy packages\RestSharp.106.5.4\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}\RestSharp.dll bin\RestSharp.dll
{{#generatePropertyChanged}}
copy packages\Fody.1.29.4\Fody.dll bin\Fody.dll
copy packages\PropertyChanged.Fody.1.51.3\PropertyChanged.Fody.dll bin\PropertyChanged.Fody.dll

8
modules/openapi-generator/src/main/resources/csharp-refactor/netcore_project.mustache
View File

@@ -23,10 +23,10 @@
<PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.7" />
{{/netStandard}}
{{^netStandard}}
<PackageReference Include="RestSharp" Version="105.1.0" />
<PackageReference Include="RestSharp" Version="106.5.4" />
{{/netStandard}}
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="JsonSubTypes" Version="1.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="JsonSubTypes" Version="1.5.1" />
</ItemGroup>
{{^netStandard}}
@@ -43,4 +43,4 @@
</ItemGroup>
{{/netStandard}}
</Project>
</Project>

8
modules/openapi-generator/src/main/resources/csharp-refactor/netcore_testproject.mustache
View File

@@ -22,10 +22,10 @@
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.7" />
{{/netStandard}}
{{^netStandard}}
<PackageReference Include="RestSharp" Version="105.1.0" />
<PackageReference Include="RestSharp" Version="106.5.4" />
{{/netStandard}}
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="JsonSubTypes" Version="1.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="JsonSubTypes" Version="1.5.1" />
</ItemGroup>
{{^netStandard}}
@@ -46,4 +46,4 @@
<ProjectReference Include="..\{{packageName}}\{{packageName}}.csproj" />
</ItemGroup>
</Project>
</Project>

6
modules/openapi-generator/src/main/resources/csharp-refactor/nuspec.mustache
View File

@@ -30,9 +30,9 @@
<!-- Dependencies are automatically installed when the package is installed -->
<dependencies>
<dependency id="NewtonSoft.Json" version="10.0.3" />
<dependency id="JsonSubTypes" version="1.2.0" />
<dependency id="RestSharp" version="105.1.0" />
<dependency id="NewtonSoft.Json" version="12.0.1" />
<dependency id="JsonSubTypes" version="1.5.1" />
<dependency id="RestSharp" version="106.5.4" />
{{#generatePropertyChanged}}
<dependency id="Fody" version="1.29.4" />
<dependency id="PropertyChanged.Fody" version="1.51.3" />

10
modules/openapi-generator/src/main/resources/csharp-refactor/packages.config.mustache
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RestSharp" version="105.1.0" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.2.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="RestSharp" version="106.5.4" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.5.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
{{#generatePropertyChanged}}
<package id="Fody" version="1.29.4" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
{{/generatePropertyChanged}}
</packages>

6
modules/openapi-generator/src/main/resources/csharp-refactor/packages_test.config.mustache
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="{{targetFrameworkNuget}}" />
<package id="RestSharp" version="105.1.0" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.2.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="RestSharp" version="106.5.4" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.5.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{#isNet452}}net452{{/isNet452}}{{^isNet452}}{{targetFrameworkNuget}}{{/isNet452}}{{/isNet40}}" developmentDependency="true" />
</packages>

6
modules/openapi-generator/src/main/resources/csharp-refactor/project.json.mustache
View File

@@ -3,10 +3,10 @@
"dependencies": {
"FubarCoder.RestSharp.Portable.Core": "4.0.7",
"FubarCoder.RestSharp.Portable.HttpClient": "4.0.7",
"Newtonsoft.Json": "10.0.3",
"JsonSubTypes": "1.2.0"
"Newtonsoft.Json": "12.0.1",
"JsonSubTypes": "1.5.1"
},
"frameworks": {
"{{targetFrameworkNuget}}": {}
}
}
}

2
samples/client/petstore/csharp-refactor/OpenAPIClient/.openapi-generator/VERSION
View File

@@ -1 +1 @@
3.3.3-SNAPSHOT
4.0.0-SNAPSHOT

10
samples/client/petstore/csharp-refactor/OpenAPIClient/.vs/Org.OpenAPITools/xs/UserPrefs.xml
View File

@@ -1,5 +1,13 @@
<Properties StartupConfiguration="{19F1DEBC-DE5E-4517-8062-F000CD499087}|Unit Tests">
<MonoDevelop.Ide.Workbench />
<MonoDevelop.Ide.Workbench ActiveDocument="src/Org.OpenAPITools.Test/Api/PetApiTests.cs">
<Files>
<File FileName="src/Org.OpenAPITools.Test/Api/PetApiTests.cs" Line="302" Column="15" />
<File FileName="src/Org.OpenAPITools/Client/ApiClient.cs" Line="239" Column="82" />
<File FileName="src/Org.OpenAPITools.Test/packages.config" Line="1" Column="1" />
<File FileName="src/Org.OpenAPITools/Api/PetApi.cs" Line="1583" Column="1" />
<File FileName="src/Org.OpenAPITools/Client/ClientUtils.cs" Line="1" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />

BIN
samples/client/petstore/csharp-refactor/OpenAPIClient/.vs/Org.OpenAPITools/xs/sqlite3/storage.ide
View File

Binary file not shown.

BIN
samples/client/petstore/csharp-refactor/OpenAPIClient/.vs/Org.OpenAPITools/xs/sqlite3/storage.ide-shm
View File

Binary file not shown.

BIN
samples/client/petstore/csharp-refactor/OpenAPIClient/.vs/Org.OpenAPITools/xs/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
samples/client/petstore/csharp-refactor/OpenAPIClient/README.md
View File

@@ -138,7 +138,6 @@ Class | Method | HTTP request | Description
- [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- [Model.Animal](docs/Animal.md)
- [Model.AnimalFarm](docs/AnimalFarm.md)
- [Model.ApiResponse](docs/ApiResponse.md)
- [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
@@ -169,7 +168,6 @@ Class | Method | HTTP request | Description
- [Model.ReadOnlyFirst](docs/ReadOnlyFirst.md)
- [Model.Return](docs/Return.md)
- [Model.SpecialModelName](docs/SpecialModelName.md)
- [Model.StringBooleanMap](docs/StringBooleanMap.md)
- [Model.Tag](docs/Tag.md)
- [Model.User](docs/User.md)

6
samples/client/petstore/csharp-refactor/OpenAPIClient/build.bat
View File

@@ -10,8 +10,8 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient
if not exist ".\bin" mkdir bin
copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll bin\JsonSubTypes.dll
copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
copy packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll bin\JsonSubTypes.dll
copy packages\RestSharp.106.5.4\lib\net452\RestSharp.dll bin\RestSharp.dll
%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\JsonSubTypes.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll /target:library /out:bin\Org.OpenAPITools.dll /recurse:src\Org.OpenAPITools\*.cs /doc:bin\Org.OpenAPITools.xml

6
samples/client/petstore/csharp-refactor/OpenAPIClient/build.sh
View File

@@ -44,9 +44,9 @@ ${nuget_cmd} install src/Org.OpenAPITools/packages.config -o packages;
echo "[INFO] Copy DLLs to the 'bin' folder"
mkdir -p bin;
cp packages/Newtonsoft.Json.10.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
cp packages/JsonSubTypes.1.2.0/lib/net45/JsonSubTypes.dll bin/JsonSubTypes.dll
cp packages/Newtonsoft.Json.12.0.1/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
cp packages/RestSharp.106.5.4/lib/net452/RestSharp.dll bin/RestSharp.dll;
cp packages/JsonSubTypes.1.5.1/lib/net45/JsonSubTypes.dll bin/JsonSubTypes.dll
echo "[INFO] Run 'mcs' to build bin/Org.OpenAPITools.dll"
mcs -langversion:${langversion} -sdk:${sdk} -r:bin/Newtonsoft.Json.dll,bin/JsonSubTypes.dll,\

2
samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumTest.md
View File

@@ -7,7 +7,7 @@ Name | Type | Description | Notes
**EnumStringRequired** | **string** | |
**EnumInteger** | **int?** | | [optional]
**EnumNumber** | **double?** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnum** | [**OuterEnum**](OuterEnum.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)

4
samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FileSchemaTestClass.md
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)

241
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
View File

@@ -35,6 +35,45 @@ namespace Org.OpenAPITools.Test
{
private PetApi instance;
private long petId = 11088;
/// <summary>
/// Create a Pet object
/// </summary>
private Pet createPet()
{
// create pet
Pet p = new Pet(name: "Csharp test", photoUrls: new List<string> { "http://petstore.com/csharp_test" });
p.Id = petId;
//p.Name = "Csharp test";
p.Status = Pet.StatusEnum.Available;
// create Category object
Category category = new Category();
category.Id = 56;
category.Name = "sample category name2";
List<String> photoUrls = new List<String>(new String[] { "sample photoUrls" });
// create Tag object
Tag tag = new Tag();
tag.Id = petId;
tag.Name = "csharp sample tag name1";
List<Tag> tags = new List<Tag>(new Tag[] { tag });
p.Tags = tags;
p.Category = category;
p.PhotoUrls = photoUrls;
return p;
}
/// <summary>
/// Convert string to byte array
/// </summary>
private byte[] GetBytes(string str)
{
byte[] bytes = new byte[str.Length * sizeof(char)];
System.Buffer.BlockCopy(str.ToCharArray(), 0, bytes, 0, bytes.Length);
return bytes;
}
/// <summary>
/// Setup before each unit test
/// </summary>
@@ -42,6 +81,13 @@ namespace Org.OpenAPITools.Test
public void Init()
{
instance = new PetApi();
// create pet
Pet p = createPet();
// add pet before testing
PetApi petApi = new PetApi("http://petstore.swagger.io/v2/");
petApi.AddPet(p);
}
/// <summary>
@@ -50,7 +96,9 @@ namespace Org.OpenAPITools.Test
[TearDown]
public void Cleanup()
{
// remove the pet after testing
PetApi petApi = new PetApi();
petApi.DeletePet(petId, "test key");
}
/// <summary>
@@ -59,8 +107,7 @@ namespace Org.OpenAPITools.Test
[Test]
public void InstanceTest()
{
// TODO uncomment below to test 'IsInstanceOfType' PetApi
//Assert.IsInstanceOfType(typeof(PetApi), instance, "instance is a PetApi");
Assert.IsInstanceOf<PetApi>(instance);
}
@@ -70,10 +117,9 @@ namespace Org.OpenAPITools.Test
[Test]
public void AddPetTest()
{
// TODO uncomment below to test the method and replace null with proper value
//Pet pet = null;
//instance.AddPet(pet);
// create pet
Pet p = createPet();
instance.AddPet(p);
}
/// <summary>
@@ -82,11 +128,7 @@ namespace Org.OpenAPITools.Test
[Test]
public void DeletePetTest()
{
// TODO uncomment below to test the method and replace null with proper value
//long? petId = null;
//string apiKey = null;
//instance.DeletePet(petId, apiKey);
// no need to test as it'c covered by Cleanup() already
}
/// <summary>
@@ -95,10 +137,15 @@ namespace Org.OpenAPITools.Test
[Test]
public void FindPetsByStatusTest()
{
// TODO uncomment below to test the method and replace null with proper value
//List<string> status = null;
//var response = instance.FindPetsByStatus(status);
//Assert.IsInstanceOf<List<Pet>> (response, "response is List<Pet>");
PetApi petApi = new PetApi();
List<String> tagsList = new List<String>(new String[] { "available" });
List<Pet> listPet = petApi.FindPetsByTags(tagsList);
foreach (Pet pet in listPet) // Loop through List with foreach.
{
Assert.IsInstanceOf<Pet>(pet);
Assert.AreEqual("csharp sample tag name1", pet.Tags[0]);
}
}
/// <summary>
@@ -107,10 +154,9 @@ namespace Org.OpenAPITools.Test
[Test]
public void FindPetsByTagsTest()
{
// TODO uncomment below to test the method and replace null with proper value
//List<string> tags = null;
//var response = instance.FindPetsByTags(tags);
//Assert.IsInstanceOf<List<Pet>> (response, "response is List<Pet>");
List<string> tags = new List<String>(new String[] { "pet" });
var response = instance.FindPetsByTags(tags);
Assert.IsInstanceOf<List<Pet>>(response);
}
/// <summary>
@@ -119,10 +165,85 @@ namespace Org.OpenAPITools.Test
[Test]
public void GetPetByIdTest()
{
// TODO uncomment below to test the method and replace null with proper value
//long? petId = null;
//var response = instance.GetPetById(petId);
//Assert.IsInstanceOf<Pet> (response, "response is Pet");
// set timeout to 10 seconds
Configuration c1 = new Configuration();
c1.Timeout = 10000;
c1.UserAgent = "TEST_USER_AGENT";
PetApi petApi = new PetApi(c1);
Pet response = petApi.GetPetById(petId);
Assert.IsInstanceOf<Pet>(response);
Assert.AreEqual("Csharp test", response.Name);
Assert.AreEqual(Pet.StatusEnum.Available, response.Status);
Assert.IsInstanceOf<List<Tag>>(response.Tags);
Assert.AreEqual(petId, response.Tags[0].Id);
Assert.AreEqual("csharp sample tag name1", response.Tags[0].Name);
Assert.IsInstanceOf<List<String>>(response.PhotoUrls);
Assert.AreEqual("sample photoUrls", response.PhotoUrls[0]);
Assert.IsInstanceOf<Category>(response.Category);
Assert.AreEqual(56, response.Category.Id);
Assert.AreEqual("sample category name2", response.Category.Name);
}
/// <summary>
/// Test GetPetByIdAsync
/// </summary>
[Test()]
public void TestGetPetByIdAsync()
{
PetApi petApi = new PetApi();
var task = petApi.GetPetByIdAsync(petId);
Pet response = task.Result;
Assert.IsInstanceOf<Pet>(response);
Assert.AreEqual("Csharp test", response.Name);
Assert.AreEqual(Pet.StatusEnum.Available, response.Status);
Assert.IsInstanceOf<List<Tag>>(response.Tags);
Assert.AreEqual(petId, response.Tags[0].Id);
Assert.AreEqual("csharp sample tag name1", response.Tags[0].Name);
Assert.IsInstanceOf<List<String>>(response.PhotoUrls);
Assert.AreEqual("sample photoUrls", response.PhotoUrls[0]);
Assert.IsInstanceOf<Category>(response.Category);
Assert.AreEqual(56, response.Category.Id);
Assert.AreEqual("sample category name2", response.Category.Name);
}
/// <summary>
/// Test GetPetByIdAsyncWithHttpInfo
/// </summary>
[Test()]
public void TestGetPetByIdAsyncWithHttpInfo()
{
PetApi petApi = new PetApi();
var task = petApi.GetPetByIdAsyncWithHttpInfo(petId);
Assert.AreEqual(200, (int)task.Result.StatusCode);
Assert.IsTrue(task.Result.Headers.ContainsKey("Content-Type"));
Assert.AreEqual("application/json", task.Result.Headers["Content-Type"][0]);
Pet response = task.Result.Data;
Assert.IsInstanceOf<Pet>(response);
Assert.AreEqual("Csharp test", response.Name);
Assert.AreEqual(Pet.StatusEnum.Available, response.Status);
Assert.IsInstanceOf<List<Tag>>(response.Tags);
Assert.AreEqual(petId, response.Tags[0].Id);
Assert.AreEqual("csharp sample tag name1", response.Tags[0].Name);
Assert.IsInstanceOf<List<String>>(response.PhotoUrls);
Assert.AreEqual("sample photoUrls", response.PhotoUrls[0]);
Assert.IsInstanceOf<Category>(response.Category);
Assert.AreEqual(56, response.Category.Id);
Assert.AreEqual("sample category name2", response.Category.Name);
}
/// <summary>
@@ -132,8 +253,9 @@ namespace Org.OpenAPITools.Test
public void UpdatePetTest()
{
// TODO uncomment below to test the method and replace null with proper value
//Pet pet = null;
//instance.UpdatePet(pet);
// create pet
Pet p = createPet();
instance.UpdatePet(p);
}
@@ -143,12 +265,24 @@ namespace Org.OpenAPITools.Test
[Test]
public void UpdatePetWithFormTest()
{
// TODO uncomment below to test the method and replace null with proper value
//long? petId = null;
//string name = null;
//string status = null;
//instance.UpdatePetWithForm(petId, name, status);
PetApi petApi = new PetApi();
petApi.UpdatePetWithForm(petId, "new form name", "pending");
Pet response = petApi.GetPetById(petId);
Assert.IsInstanceOf<Pet>(response);
Assert.IsInstanceOf<Category>(response.Category);
Assert.IsInstanceOf<List<Tag>>(response.Tags);
Assert.AreEqual("new form name", response.Name);
Assert.AreEqual(Pet.StatusEnum.Pending, response.Status);
Assert.AreEqual(petId, response.Tags[0].Id);
Assert.AreEqual(56, response.Category.Id);
// test optional parameter
petApi.UpdatePetWithForm(petId, "new form name2");
Pet response2 = petApi.GetPetById(petId);
Assert.AreEqual("new form name2", response2.Name);
}
/// <summary>
@@ -157,12 +291,15 @@ namespace Org.OpenAPITools.Test
[Test]
public void UploadFileTest()
{
// TODO uncomment below to test the method and replace null with proper value
//long? petId = null;
//string additionalMetadata = null;
//System.IO.Stream file = null;
//var response = instance.UploadFile(petId, additionalMetadata, file);
//Assert.IsInstanceOf<ApiResponse> (response, "response is ApiResponse");
Assembly _assembly = Assembly.GetExecutingAssembly();
Stream _imageStream = _assembly.GetManifestResourceStream("Org.OpenAPITools.Test.linux-logo.png");
PetApi petApi = new PetApi();
// test file upload with form parameters
//petApi.UploadFile(petId, "new form name", _imageStream);
// test file upload without any form parameters
// using optional parameter syntax introduced at .net 4.0
//petApi.UploadFile(petId: petId, file: _imageStream);
}
/// <summary>
@@ -178,6 +315,34 @@ namespace Org.OpenAPITools.Test
//var response = instance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
//Assert.IsInstanceOf<ApiResponse> (response, "response is ApiResponse");
}
/// <summary>
/// Test status code
/// </summary>
[Test()]
public void TestStatusCodeAndHeader()
{
PetApi petApi = new PetApi();
var response = petApi.GetPetByIdWithHttpInfo(petId);
//Assert.AreEqual("OK", response.StatusCode);
Assert.AreEqual(200, (int)response.StatusCode);
Assert.IsTrue(response.Headers.ContainsKey("Content-Type"));
Assert.AreEqual("application/json", response.Headers["Content-Type"][0]);
}
/// <summary>
/// Test default header (should be deprecated)
/// </summary>
[Test()]
public void TestDefaultHeader()
{
//PetApi petApi = new PetApi();
// commented out the warning test below as it's confirmed the warning is working as expected
// there should be a warning for using AddDefaultHeader (deprecated) below
//petApi.AddDefaultHeader ("header_key", "header_value");
// the following should be used instead as suggested in the doc
//petApi.Configuration.AddDefaultHeader("header_key2", "header_value2");
}
}

32
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
View File

@@ -16,7 +16,7 @@ OpenAPI spec version: 1.0.0
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Org.OpenAPITools.Test</RootNamespace>
<AssemblyName>Org.OpenAPITools.Test</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -47,22 +47,22 @@ OpenAPI spec version: 1.0.0
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -72,8 +72,7 @@ OpenAPI spec version: 1.0.0
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs"
Exclude="obj\**"/>
<Compile Include="**\*.cs" Exclude="obj\**" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
@@ -85,5 +84,8 @@ OpenAPI spec version: 1.0.0
<Name>Org.OpenAPITools</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="linux-logo.png" />
</ItemGroup>
</Project>

BIN
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 KiB

6
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
<package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
<package id="RestSharp" version="106.5.4" targetFramework="net452" developmentDependency="true" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" developmentDependency="true" />
<package id="JsonSubTypes" version="1.5.1" targetFramework="net452" developmentDependency="true" />
</packages>

14
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
View File

@@ -229,13 +229,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = modelClient;

168
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
View File

@@ -795,13 +795,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"*/*"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = body;
@@ -902,13 +902,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"*/*"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = outerComposite;
@@ -1009,13 +1009,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"*/*"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = body;
@@ -1116,13 +1116,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"*/*"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = body;
@@ -1225,13 +1225,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = fileSchemaTestClass;
@@ -1341,13 +1341,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (query != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "query", query))
@@ -1479,13 +1479,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = modelClient;
@@ -1627,13 +1627,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (integer != null)
{
requestOptions.FormParameters.Add("integer", Org.OpenAPITools.Client.ClientUtils.ParameterToString(integer)); // form parameter
@@ -1906,13 +1906,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (enumQueryStringArray != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "enum_query_string_array", enumQueryStringArray))
@@ -2145,13 +2145,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (requiredStringGroup != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_string_group", requiredStringGroup))
@@ -2357,13 +2357,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = requestBody;
@@ -2473,13 +2473,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (param != null)
{
requestOptions.FormParameters.Add("param", Org.OpenAPITools.Client.ClientUtils.ParameterToString(param)); // form parameter

14
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
View File

@@ -229,13 +229,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = modelClient;
// authentication (api_key_query) required

126
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
View File

@@ -592,13 +592,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = pet;
// authentication (petstore_auth) required
@@ -717,13 +717,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (petId != null)
requestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter
if (apiKey != null)
@@ -849,13 +849,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (status != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "status", status))
@@ -994,13 +994,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (tags != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "tags", tags))
@@ -1139,13 +1139,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (petId != null)
requestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter
@@ -1265,13 +1265,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = pet;
// authentication (petstore_auth) required
@@ -1393,13 +1393,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (petId != null)
requestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter
if (name != null)
@@ -1544,13 +1544,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (petId != null)
requestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter
if (additionalMetadata != null)
@@ -1700,13 +1700,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (petId != null)
requestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter
if (additionalMetadata != null)

56
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
View File

@@ -348,13 +348,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (orderId != null)
requestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter
@@ -456,13 +456,13 @@ namespace Org.OpenAPITools.Api
String[] @accepts = new String[] {
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
// authentication (api_key) required
if (!String.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key")))
@@ -573,13 +573,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (orderId != null)
requestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter
@@ -690,13 +690,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = order;

112
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
View File

@@ -524,13 +524,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = user;
@@ -633,13 +633,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = user;
@@ -742,13 +742,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
requestOptions.Data = user;
@@ -851,13 +851,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (username != null)
requestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter
@@ -965,13 +965,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (username != null)
requestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter
@@ -1087,13 +1087,13 @@ namespace Org.OpenAPITools.Api
"application/xml",
"application/json"
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (username != null)
{
foreach (var kvp in Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "username", username))
@@ -1237,13 +1237,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
// make the HTTP request
@@ -1344,13 +1344,13 @@ namespace Org.OpenAPITools.Api
// to determine the Accept header
String[] @accepts = new String[] {
};
foreach (var contentType in @contentTypes)
requestOptions.HeaderParameters.Add("Content-Type", contentType);
foreach (var accept in @accepts)
requestOptions.HeaderParameters.Add("Accept", accept);
var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes);
if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType);
var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts);
if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept);
if (username != null)
requestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter
requestOptions.Data = user;

55
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@@ -19,9 +19,14 @@ using System.IO;
using System.Web;
using System.Linq;
using System.Net;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters;
using System.Text;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using RestSharp;
using RestSharp.Deserializers;
using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
using RestSharpMethod = RestSharp.Method;
namespace Org.OpenAPITools.Client
@@ -36,8 +41,15 @@ namespace Org.OpenAPITools.Client
private string _contentType = "application/json";
private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
{
// Swagger generated types generally hide default constructors.
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
// OpenAPI generated types generally hide default constructors.
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
ContractResolver = new DefaultContractResolver
{
NamingStrategy = new CamelCaseNamingStrategy()
{
OverrideSpecifiedNames = true
}
}
};
public CustomJsonCodec(IReadableConfiguration configuration)
@@ -55,21 +67,14 @@ namespace Org.OpenAPITools.Client
public string Serialize(object obj)
{
using (var writer = new StringWriter())
using (var jsonWriter = new JsonTextWriter(writer)
{
Formatting = Formatting.None,
DateFormatString = _configuration.DateTimeFormat
})
{
_serializer.Serialize(jsonWriter, obj);
return writer.ToString();
}
String result = JsonConvert.SerializeObject(obj, _serializerSettings);
return result;
}
public T Deserialize<T>(IRestResponse response)
{
return (T) Deserialize(response, typeof(T));
var result = (T) Deserialize(response, typeof(T));
return result;
}
/// <summary>
@@ -244,7 +249,11 @@ namespace Org.OpenAPITools.Client
if (options == null) throw new ArgumentNullException("options");
if (configuration == null) throw new ArgumentNullException("configuration");
RestRequest request = new RestRequest(path, Method(method));
RestRequest request = new RestRequest(Method(method))
{
Resource = path,
JsonSerializer = new CustomJsonCodec(configuration)
};
if (options.PathParameters != null)
{
@@ -369,9 +378,19 @@ namespace Org.OpenAPITools.Client
{
RestClient client = new RestClient(_baseUrl);
var codec = new CustomJsonCodec(configuration);
req.JsonSerializer = codec;
client.AddHandler(codec.ContentType, codec);
client.ClearHandlers();
var existingDeserializer = req.JsonSerializer as IDeserializer;
if (existingDeserializer != null)
{
client.AddHandler(existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
}
else
{
var codec = new CustomJsonCodec(configuration);
client.AddHandler(codec, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
}
client.AddHandler(new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
client.Timeout = configuration.Timeout;
@@ -379,7 +398,7 @@ namespace Org.OpenAPITools.Client
{
client.UserAgent = configuration.UserAgent;
}
InterceptRequest(req);
var response = await client.ExecuteTaskAsync<T>(req);
InterceptResponse(req, response);

59
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@@ -192,6 +192,61 @@ namespace Org.OpenAPITools.Client
public static dynamic ConvertType(dynamic fromObject, Type toObject)
{
return Convert.ChangeType(fromObject, toObject);
}
}
/// <summary>
/// Select the Content-Type header's value from the given content-type array:
/// if JSON type exists in the given array, use it;
/// otherwise use the first one defined in 'consumes'
/// </summary>
/// <param name="contentTypes">The Content-Type array to select from.</param>
/// <returns>The Content-Type header to use.</returns>
public static String SelectHeaderContentType(String[] contentTypes)
{
if (contentTypes.Length == 0)
return "application/json";
foreach (var contentType in contentTypes)
{
if (IsJsonMime(contentType.ToLower()))
return contentType;
}
return contentTypes[0]; // use the first content type specified in 'consumes'
}
/// <summary>
/// Select the Accept header's value from the given accepts array:
/// if JSON exists in the given array, use it;
/// otherwise use all of them (joining into a string)
/// </summary>
/// <param name="accepts">The accepts array to select from.</param>
/// <returns>The Accept header to use.</returns>
public static String SelectHeaderAccept(String[] accepts)
{
if (accepts.Length == 0)
return null;
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
return "application/json";
return String.Join(",", accepts);
}
/// <summary>
/// Check if the given MIME is a JSON MIME.
/// JSON MIME examples:
/// application/json
/// application/json; charset=UTF8
/// APPLICATION/JSON
/// application/vnd.company+json
/// </summary>
/// <param name="mime">MIME</param>
/// <returns>Returns True if MIME type is json.</returns>
public static bool IsJsonMime(String mime)
{
var jsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
return mime != null && (jsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json"));
}
}
}
}

12
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
View File

@@ -141,11 +141,6 @@ namespace Org.OpenAPITools.Model
[DataMember(Name="enum_number", EmitDefaultValue=false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name="outerEnum", EmitDefaultValue=false)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="EnumTest" /> class.
/// </summary>
[JsonConstructorAttribute]
@@ -158,7 +153,7 @@ namespace Org.OpenAPITools.Model
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum outerEnum = default(OuterEnum))
{
// to ensure "enumStringRequired" is required (not null)
if (enumStringRequired == null)
@@ -179,6 +174,11 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name="outerEnum", EmitDefaultValue=false)]
public OuterEnum OuterEnum { get; set; }
/// <summary>
/// Returns the string presentation of the object

6
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
View File

@@ -36,7 +36,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;
@@ -46,13 +46,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

26
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
View File

@@ -17,7 +17,7 @@ OpenAPI spec version: 1.0.0
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Org.OpenAPITools</RootNamespace>
<AssemblyName>Org.OpenAPITools</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,22 +48,22 @@ OpenAPI spec version: 1.0.0
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

6
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
View File

@@ -25,9 +25,9 @@
<!-- Dependencies are automatically installed when the package is installed -->
<dependencies>
<dependency id="NewtonSoft.Json" version="10.0.3" />
<dependency id="JsonSubTypes" version="1.2.0" />
<dependency id="RestSharp" version="105.1.0" />
<dependency id="NewtonSoft.Json" version="12.0.1" />
<dependency id="JsonSubTypes" version="1.5.1" />
<dependency id="RestSharp" version="106.5.4" />
</dependencies>
</metadata>

6
samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
<package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
<package id="RestSharp" version="106.5.4" targetFramework="net452" developmentDependency="true" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" developmentDependency="true" />
<package id="JsonSubTypes" version="1.5.1" targetFramework="net452" developmentDependency="true" />
</packages>