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

[C#][netcore] minor bug fixes (#10074)

Browse Source 
* fix property name, fix enum comment

* update doc
This commit is contained in:
William Cheng
2021-08-03 16:43:39 +08:00
committed by GitHub
parent 0ceeddb441
commit 31eb65ab67
14 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/generators/aspnetcore.md
View File

@@ -98,6 +98,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
<ul class="column-ul">
<li>Client</li>
<li>Configuration</li>
<li>Version</li>
<li>abstract</li>
<li>as</li>
<li>async</li>

2
docs/generators/csharp-dotnet2.md
View File

@@ -68,6 +68,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
<ul class="column-ul">
<li>Client</li>
<li>Configuration</li>
<li>Version</li>
<li>abstract</li>
<li>as</li>
<li>base</li>

2
docs/generators/csharp-netcore.md
View File

@@ -94,6 +94,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
<ul class="column-ul">
<li>Client</li>
<li>Configuration</li>
<li>Version</li>
<li>abstract</li>
<li>as</li>
<li>base</li>

2
docs/generators/csharp.md
View File

@@ -88,6 +88,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
<ul class="column-ul">
<li>Client</li>
<li>Configuration</li>
<li>Version</li>
<li>abstract</li>
<li>as</li>
<li>base</li>

9
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View File

@@ -87,6 +87,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
private final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class);
// special property keywords not allowed as these are the function names in the model files
protected Set<String> propertySpecialKeywords = new HashSet<>(Arrays.asList("ToString", "ToJson", "GetHashCode", "Equals", "ShouldSerializeToString"));
public AbstractCSharpCodegen() {
super();
@@ -115,7 +118,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// set "client" as a reserved word to avoid conflicts with Org.OpenAPITools.Client
// this is a workaround and can be removed if c# api client is updated to use
// fully qualified name
"Client", "client", "parameter",
"Client", "client", "parameter", "Configuration", "Version",
// local variable names in API methods (endpoints)
"localVarPath", "localVarPathParams", "localVarQueryParams", "localVarHeaderParams",
"localVarFormParams", "localVarFileParams", "localVarStatusCode", "localVarResponse",
@@ -829,6 +832,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
name = escapeReservedWord(name);
}
if (propertySpecialKeywords.contains(name)) {
return camelize("property_" + name);
}
return name;
}

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
View File

@@ -902,6 +902,11 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
name = escapeReservedWord(name);
}
// for function names in the model, escape with the "Property" prefix
if (propertySpecialKeywords.contains(name)) {
return camelize("property_" + name);
}
return name;
}

2
modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache vendored
View File

@@ -18,7 +18,7 @@
{{#allowableValues}}
{{#enumVars}}
/// <summary>
/// Enum {{name}} for value: {{{value}}}
/// Enum {{name}} for value: {{value}}
/// </summary>
{{#isString}}
[EnumMember(Value = "{{{value}}}")]

2
modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache vendored
View File

@@ -13,7 +13,7 @@
{{#allowableValues}}
{{#enumVars}}
/// <summary>
/// Enum {{name}} for value: {{{value}}}
/// Enum {{name}} for value: {{value}}
/// </summary>
{{#isString}}
[EnumMember(Value = "{{{value}}}")]

2
samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,

2
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -40,7 +40,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,

2
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,

2
samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,

2
samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
View File

@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model
public enum JustSymbolEnum
{
/// <summary>
/// Enum GreaterThanOrEqualTo for value: >=
/// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
/// </summary>
[EnumMember(Value = ">=")]
GreaterThanOrEqualTo = 1,