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

[C#] fix integer enum without format (#9136)

Browse Source 
* fix inner enum integer without format

* add line break, update samples

* remove line break

* add line break

* update SHA
This commit is contained in:
William Cheng
2021-03-31 15:11:10 +08:00
committed by GitHub
parent e1ef00903e
commit de5651adac
56 changed files with 411 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/utils/test_file_list.yaml
View File

@@ -1,7 +1,7 @@
---
# csharp-netcore test files and image for upload
- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs"
sha256: ec34838fbbb1abb9f762949d510503b6237b607400a85c848c234c39d013a776
sha256: 95e40cace36e7cd1608fa494161f06291f4cfb8f859ec4196ae9939f520b152a
- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
sha256: dae985015ba461297927d544a78267f2def35e07c3f14ca66468fd61e1fd1c26
- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png"

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

@@ -576,7 +576,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
var.isString = false;
var.isLong = false;
var.isInteger = false;
} else if ("int32".equals(var.dataFormat)) {
} else if ("int".equals(var.dataType) || "int32".equals(var.dataFormat)) {
var.isInteger = true;
var.isString = false;
var.isLong = false;

1
modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache vendored
View File

@@ -24,6 +24,7 @@
{{/complexType}}
{{/isEnum}}
{{#isEnum}}
/// <summary>
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// </summary>

5
modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
View File

@@ -1546,6 +1546,11 @@ components:
enum:
- 1
- -1
enum_integer_only:
type: integer
enum:
- 2
- -2
enum_number:
type: number
format: double

1
samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md
View File

@@ -7,6 +7,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional]
**EnumStringRequired** | **string** | |
**EnumInteger** | **int** | | [optional]
**EnumIntegerOnly** | **int** | | [optional]
**EnumNumber** | **double** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnumInteger** | **OuterEnumInteger** | | [optional]

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

@@ -48,6 +48,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets JustSymbol
/// </summary>
@@ -78,6 +79,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets ArrayEnum
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumString
/// </summary>
@@ -89,6 +90,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
@@ -111,12 +113,36 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumInteger
/// </summary>
[DataMember(Name = "enum_integer", EmitDefaultValue = false)]
public EnumIntegerEnum? EnumInteger { get; set; }
/// <summary>
/// Defines EnumIntegerOnly
/// </summary>
public enum EnumIntegerOnlyEnum
{
/// <summary>
/// Enum NUMBER_2 for value: 2
/// </summary>
NUMBER_2 = 2,
/// <summary>
/// Enum NUMBER_MINUS_2 for value: -2
/// </summary>
NUMBER_MINUS_2 = -2
}
/// <summary>
/// Gets or Sets EnumIntegerOnly
/// </summary>
[DataMember(Name = "enum_integer_only", EmitDefaultValue = false)]
public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; }
/// <summary>
/// Defines EnumNumber
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
@@ -136,26 +162,31 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumNumber
/// </summary>
[DataMember(Name = "enum_number", EmitDefaultValue = false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name = "outerEnum", EmitDefaultValue = true)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Gets or Sets OuterEnumInteger
/// </summary>
[DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)]
public OuterEnumInteger? OuterEnumInteger { get; set; }
/// <summary>
/// Gets or Sets OuterEnumDefaultValue
/// </summary>
[DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)]
public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; }
/// <summary>
/// Gets or Sets OuterEnumIntegerDefaultValue
/// </summary>
@@ -175,16 +206,18 @@ namespace Org.OpenAPITools.Model
/// <param name="enumString">enumString.</param>
/// <param name="enumStringRequired">enumStringRequired (required).</param>
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumIntegerOnly">enumIntegerOnly.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
/// <param name="outerEnumInteger">outerEnumInteger.</param>
/// <param name="outerEnumDefaultValue">outerEnumDefaultValue.</param>
/// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
{
this.EnumStringRequired = enumStringRequired;
this.EnumString = enumString;
this.EnumInteger = enumInteger;
this.EnumIntegerOnly = enumIntegerOnly;
this.EnumNumber = enumNumber;
this.OuterEnum = outerEnum;
this.OuterEnumInteger = outerEnumInteger;
@@ -210,6 +243,7 @@ namespace Org.OpenAPITools.Model
sb.Append(" EnumString: ").Append(EnumString).Append("\n");
sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n");
sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n");
sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n");
sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
@@ -261,6 +295,7 @@ namespace Org.OpenAPITools.Model
hashCode = hashCode * 59 + this.EnumString.GetHashCode();
hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
hashCode = hashCode * 59 + this.EnumIntegerOnly.GetHashCode();
hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnumInteger.GetHashCode();

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

@@ -53,6 +53,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets MapOfEnumString
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Order Status
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// pet status in the store
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets Type
/// </summary>

1
samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md
View File

@@ -7,6 +7,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional]
**EnumStringRequired** | **string** | |
**EnumInteger** | **int** | | [optional]
**EnumIntegerOnly** | **int** | | [optional]
**EnumNumber** | **double** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnumInteger** | **OuterEnumInteger** | | [optional]

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

@@ -48,6 +48,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets JustSymbol
/// </summary>
@@ -78,6 +79,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets ArrayEnum
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumString
/// </summary>
@@ -89,6 +90,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
@@ -111,12 +113,36 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumInteger
/// </summary>
[DataMember(Name = "enum_integer", EmitDefaultValue = false)]
public EnumIntegerEnum? EnumInteger { get; set; }
/// <summary>
/// Defines EnumIntegerOnly
/// </summary>
public enum EnumIntegerOnlyEnum
{
/// <summary>
/// Enum NUMBER_2 for value: 2
/// </summary>
NUMBER_2 = 2,
/// <summary>
/// Enum NUMBER_MINUS_2 for value: -2
/// </summary>
NUMBER_MINUS_2 = -2
}
/// <summary>
/// Gets or Sets EnumIntegerOnly
/// </summary>
[DataMember(Name = "enum_integer_only", EmitDefaultValue = false)]
public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; }
/// <summary>
/// Defines EnumNumber
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
@@ -136,26 +162,31 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumNumber
/// </summary>
[DataMember(Name = "enum_number", EmitDefaultValue = false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name = "outerEnum", EmitDefaultValue = true)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Gets or Sets OuterEnumInteger
/// </summary>
[DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)]
public OuterEnumInteger? OuterEnumInteger { get; set; }
/// <summary>
/// Gets or Sets OuterEnumDefaultValue
/// </summary>
[DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)]
public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; }
/// <summary>
/// Gets or Sets OuterEnumIntegerDefaultValue
/// </summary>
@@ -175,16 +206,18 @@ namespace Org.OpenAPITools.Model
/// <param name="enumString">enumString.</param>
/// <param name="enumStringRequired">enumStringRequired (required).</param>
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumIntegerOnly">enumIntegerOnly.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
/// <param name="outerEnumInteger">outerEnumInteger.</param>
/// <param name="outerEnumDefaultValue">outerEnumDefaultValue.</param>
/// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
{
this.EnumStringRequired = enumStringRequired;
this.EnumString = enumString;
this.EnumInteger = enumInteger;
this.EnumIntegerOnly = enumIntegerOnly;
this.EnumNumber = enumNumber;
this.OuterEnum = outerEnum;
this.OuterEnumInteger = outerEnumInteger;
@@ -210,6 +243,7 @@ namespace Org.OpenAPITools.Model
sb.Append(" EnumString: ").Append(EnumString).Append("\n");
sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n");
sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n");
sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n");
sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
@@ -261,6 +295,7 @@ namespace Org.OpenAPITools.Model
hashCode = hashCode * 59 + this.EnumString.GetHashCode();
hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
hashCode = hashCode * 59 + this.EnumIntegerOnly.GetHashCode();
hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnumInteger.GetHashCode();

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

@@ -53,6 +53,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets MapOfEnumString
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Order Status
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// pet status in the store
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets Type
/// </summary>

1
samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md
View File

@@ -7,6 +7,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional]
**EnumStringRequired** | **string** | |
**EnumInteger** | **int** | | [optional]
**EnumIntegerOnly** | **int** | | [optional]
**EnumNumber** | **double** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnumInteger** | **OuterEnumInteger** | | [optional]

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

@@ -48,6 +48,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets JustSymbol
/// </summary>
@@ -78,6 +79,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets ArrayEnum
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumString
/// </summary>
@@ -89,6 +90,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
@@ -111,12 +113,36 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumInteger
/// </summary>
[DataMember(Name = "enum_integer", EmitDefaultValue = false)]
public EnumIntegerEnum? EnumInteger { get; set; }
/// <summary>
/// Defines EnumIntegerOnly
/// </summary>
public enum EnumIntegerOnlyEnum
{
/// <summary>
/// Enum NUMBER_2 for value: 2
/// </summary>
NUMBER_2 = 2,
/// <summary>
/// Enum NUMBER_MINUS_2 for value: -2
/// </summary>
NUMBER_MINUS_2 = -2
}
/// <summary>
/// Gets or Sets EnumIntegerOnly
/// </summary>
[DataMember(Name = "enum_integer_only", EmitDefaultValue = false)]
public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; }
/// <summary>
/// Defines EnumNumber
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
@@ -136,26 +162,31 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumNumber
/// </summary>
[DataMember(Name = "enum_number", EmitDefaultValue = false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name = "outerEnum", EmitDefaultValue = true)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Gets or Sets OuterEnumInteger
/// </summary>
[DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)]
public OuterEnumInteger? OuterEnumInteger { get; set; }
/// <summary>
/// Gets or Sets OuterEnumDefaultValue
/// </summary>
[DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)]
public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; }
/// <summary>
/// Gets or Sets OuterEnumIntegerDefaultValue
/// </summary>
@@ -175,16 +206,18 @@ namespace Org.OpenAPITools.Model
/// <param name="enumString">enumString.</param>
/// <param name="enumStringRequired">enumStringRequired (required).</param>
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumIntegerOnly">enumIntegerOnly.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
/// <param name="outerEnumInteger">outerEnumInteger.</param>
/// <param name="outerEnumDefaultValue">outerEnumDefaultValue.</param>
/// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
{
this.EnumStringRequired = enumStringRequired;
this.EnumString = enumString;
this.EnumInteger = enumInteger;
this.EnumIntegerOnly = enumIntegerOnly;
this.EnumNumber = enumNumber;
this.OuterEnum = outerEnum;
this.OuterEnumInteger = outerEnumInteger;
@@ -210,6 +243,7 @@ namespace Org.OpenAPITools.Model
sb.Append(" EnumString: ").Append(EnumString).Append("\n");
sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n");
sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n");
sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n");
sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
@@ -261,6 +295,7 @@ namespace Org.OpenAPITools.Model
hashCode = hashCode * 59 + this.EnumString.GetHashCode();
hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
hashCode = hashCode * 59 + this.EnumIntegerOnly.GetHashCode();
hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnumInteger.GetHashCode();

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

@@ -53,6 +53,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets MapOfEnumString
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Order Status
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// pet status in the store
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets Type
/// </summary>

1
samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
View File

@@ -7,6 +7,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional]
**EnumStringRequired** | **string** | |
**EnumInteger** | **int** | | [optional]
**EnumIntegerOnly** | **int** | | [optional]
**EnumNumber** | **double** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnumInteger** | **OuterEnumInteger** | | [optional]

12
samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
View File

@@ -171,5 +171,17 @@ namespace Org.OpenAPITools.Test
OuterEnumInteger instance = OuterEnumInteger.NUMBER_1;
Assert.Equal(1, (int)instance);
}
/// <summary>
/// Test inner enum integer
/// </summary>
[Fact]
public void InnerEnumIntegerInstanceTest()
{
EnumTest enumTest = new EnumTest();
enumTest.EnumIntegerOnly = EnumTest.EnumIntegerOnlyEnum.NUMBER_2;
enumTest.EnumInteger = EnumTest.EnumIntegerEnum.NUMBER_MINUS_1;
Assert.Equal("{\"enum_integer\":-1,\"enum_integer_only\":2,\"outerEnum\":null}", JsonConvert.SerializeObject(enumTest));
}
}
}

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

@@ -48,6 +48,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets JustSymbol
/// </summary>
@@ -78,6 +79,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets ArrayEnum
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumString
/// </summary>
@@ -89,6 +90,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
@@ -111,12 +113,36 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumInteger
/// </summary>
[DataMember(Name = "enum_integer", EmitDefaultValue = false)]
public EnumIntegerEnum? EnumInteger { get; set; }
/// <summary>
/// Defines EnumIntegerOnly
/// </summary>
public enum EnumIntegerOnlyEnum
{
/// <summary>
/// Enum NUMBER_2 for value: 2
/// </summary>
NUMBER_2 = 2,
/// <summary>
/// Enum NUMBER_MINUS_2 for value: -2
/// </summary>
NUMBER_MINUS_2 = -2
}
/// <summary>
/// Gets or Sets EnumIntegerOnly
/// </summary>
[DataMember(Name = "enum_integer_only", EmitDefaultValue = false)]
public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; }
/// <summary>
/// Defines EnumNumber
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
@@ -136,26 +162,31 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumNumber
/// </summary>
[DataMember(Name = "enum_number", EmitDefaultValue = false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name = "outerEnum", EmitDefaultValue = true)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Gets or Sets OuterEnumInteger
/// </summary>
[DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)]
public OuterEnumInteger? OuterEnumInteger { get; set; }
/// <summary>
/// Gets or Sets OuterEnumDefaultValue
/// </summary>
[DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)]
public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; }
/// <summary>
/// Gets or Sets OuterEnumIntegerDefaultValue
/// </summary>
@@ -175,16 +206,18 @@ namespace Org.OpenAPITools.Model
/// <param name="enumString">enumString.</param>
/// <param name="enumStringRequired">enumStringRequired (required).</param>
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumIntegerOnly">enumIntegerOnly.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
/// <param name="outerEnumInteger">outerEnumInteger.</param>
/// <param name="outerEnumDefaultValue">outerEnumDefaultValue.</param>
/// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
{
this.EnumStringRequired = enumStringRequired;
this.EnumString = enumString;
this.EnumInteger = enumInteger;
this.EnumIntegerOnly = enumIntegerOnly;
this.EnumNumber = enumNumber;
this.OuterEnum = outerEnum;
this.OuterEnumInteger = outerEnumInteger;
@@ -210,6 +243,7 @@ namespace Org.OpenAPITools.Model
sb.Append(" EnumString: ").Append(EnumString).Append("\n");
sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n");
sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n");
sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n");
sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
@@ -261,6 +295,7 @@ namespace Org.OpenAPITools.Model
hashCode = hashCode * 59 + this.EnumString.GetHashCode();
hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
hashCode = hashCode * 59 + this.EnumIntegerOnly.GetHashCode();
hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnumInteger.GetHashCode();

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

@@ -53,6 +53,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets MapOfEnumString
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Order Status
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// pet status in the store
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets Type
/// </summary>

1
samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
View File

@@ -7,6 +7,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional]
**EnumStringRequired** | **string** | |
**EnumInteger** | **int** | | [optional]
**EnumIntegerOnly** | **int** | | [optional]
**EnumNumber** | **double** | | [optional]
**OuterEnum** | **OuterEnum** | | [optional]
**OuterEnumInteger** | **OuterEnumInteger** | | [optional]

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

@@ -48,6 +48,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets PetType
/// </summary>

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

@@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets JustSymbol
/// </summary>
@@ -78,6 +79,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets ArrayEnum
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumString
/// </summary>
@@ -89,6 +90,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
@@ -111,12 +113,36 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumInteger
/// </summary>
[DataMember(Name = "enum_integer", EmitDefaultValue = false)]
public EnumIntegerEnum? EnumInteger { get; set; }
/// <summary>
/// Defines EnumIntegerOnly
/// </summary>
public enum EnumIntegerOnlyEnum
{
/// <summary>
/// Enum NUMBER_2 for value: 2
/// </summary>
NUMBER_2 = 2,
/// <summary>
/// Enum NUMBER_MINUS_2 for value: -2
/// </summary>
NUMBER_MINUS_2 = -2
}
/// <summary>
/// Gets or Sets EnumIntegerOnly
/// </summary>
[DataMember(Name = "enum_integer_only", EmitDefaultValue = false)]
public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; }
/// <summary>
/// Defines EnumNumber
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
@@ -136,26 +162,31 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets EnumNumber
/// </summary>
[DataMember(Name = "enum_number", EmitDefaultValue = false)]
public EnumNumberEnum? EnumNumber { get; set; }
/// <summary>
/// Gets or Sets OuterEnum
/// </summary>
[DataMember(Name = "outerEnum", EmitDefaultValue = true)]
public OuterEnum? OuterEnum { get; set; }
/// <summary>
/// Gets or Sets OuterEnumInteger
/// </summary>
[DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)]
public OuterEnumInteger? OuterEnumInteger { get; set; }
/// <summary>
/// Gets or Sets OuterEnumDefaultValue
/// </summary>
[DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)]
public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; }
/// <summary>
/// Gets or Sets OuterEnumIntegerDefaultValue
/// </summary>
@@ -172,16 +203,18 @@ namespace Org.OpenAPITools.Model
/// <param name="enumString">enumString.</param>
/// <param name="enumStringRequired">enumStringRequired (required).</param>
/// <param name="enumInteger">enumInteger.</param>
/// <param name="enumIntegerOnly">enumIntegerOnly.</param>
/// <param name="enumNumber">enumNumber.</param>
/// <param name="outerEnum">outerEnum.</param>
/// <param name="outerEnumInteger">outerEnumInteger.</param>
/// <param name="outerEnumDefaultValue">outerEnumDefaultValue.</param>
/// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue.</param>
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?))
{
this.EnumStringRequired = enumStringRequired;
this.EnumString = enumString;
this.EnumInteger = enumInteger;
this.EnumIntegerOnly = enumIntegerOnly;
this.EnumNumber = enumNumber;
this.OuterEnum = outerEnum;
this.OuterEnumInteger = outerEnumInteger;
@@ -200,6 +233,7 @@ namespace Org.OpenAPITools.Model
sb.Append(" EnumString: ").Append(EnumString).Append("\n");
sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n");
sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n");
sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n");
sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
@@ -250,6 +284,7 @@ namespace Org.OpenAPITools.Model
hashCode = hashCode * 59 + this.EnumString.GetHashCode();
hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode();
hashCode = hashCode * 59 + this.EnumInteger.GetHashCode();
hashCode = hashCode * 59 + this.EnumIntegerOnly.GetHashCode();
hashCode = hashCode * 59 + this.EnumNumber.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnum.GetHashCode();
hashCode = hashCode * 59 + this.OuterEnumInteger.GetHashCode();

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

@@ -53,6 +53,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets MapOfEnumString
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Order Status
/// </summary>

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

@@ -59,6 +59,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// pet status in the store
/// </summary>

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

@@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Model
}
/// <summary>
/// Gets or Sets Type
/// </summary>

5
samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml
View File

@@ -1689,6 +1689,11 @@ components:
- -1
format: int32
type: integer
enum_integer_only:
enum:
- 2
- -2
type: integer
enum_number:
enum:
- 1.1

10
samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumTest.md
View File

@@ -10,6 +10,7 @@ Name | Type | Description | Notes
**enumString** | [**EnumStringEnum**](#EnumStringEnum) | | [optional]
**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) | |
**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) | | [optional]
**enumIntegerOnly** | [**EnumIntegerOnlyEnum**](#EnumIntegerOnlyEnum) | | [optional]
**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) | | [optional]
**outerEnum** | **OuterEnum** | | [optional]
**outerEnumInteger** | **OuterEnumInteger** | | [optional]
@@ -47,6 +48,15 @@ NUMBER_MINUS_1 | -1
## Enum: EnumIntegerOnlyEnum
Name | Value
---- | -----
NUMBER_2 | 2
NUMBER_MINUS_2 | -2
## Enum: EnumNumberEnum
Name | Value

69
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
View File

@@ -42,6 +42,7 @@ import org.openapitools.client.JSON;
EnumTest.JSON_PROPERTY_ENUM_STRING,
EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
EnumTest.JSON_PROPERTY_ENUM_INTEGER,
EnumTest.JSON_PROPERTY_ENUM_INTEGER_ONLY,
EnumTest.JSON_PROPERTY_ENUM_NUMBER,
EnumTest.JSON_PROPERTY_OUTER_ENUM,
EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER,
@@ -168,6 +169,44 @@ public class EnumTest {
public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
private EnumIntegerEnum enumInteger;
/**
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(2),
NUMBER_MINUS_2(-2);
private Integer value;
EnumIntegerOnlyEnum(Integer value) {
this.value = value;
}
@JsonValue
public Integer getValue() {
return value;
}
@Override
public String toString() {
return String.valueOf(value);
}
@JsonCreator
public static EnumIntegerOnlyEnum fromValue(Integer value) {
for (EnumIntegerOnlyEnum b : EnumIntegerOnlyEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}
public static final String JSON_PROPERTY_ENUM_INTEGER_ONLY = "enum_integer_only";
private EnumIntegerOnlyEnum enumIntegerOnly;
/**
* Gets or Sets enumNumber
*/
@@ -296,6 +335,32 @@ public class EnumTest {
}
public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
this.enumIntegerOnly = enumIntegerOnly;
return this;
}
/**
* Get enumIntegerOnly
* @return enumIntegerOnly
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public EnumIntegerOnlyEnum getEnumIntegerOnly() {
return enumIntegerOnly;
}
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setEnumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
this.enumIntegerOnly = enumIntegerOnly;
}
public EnumTest enumNumber(EnumNumberEnum enumNumber) {
this.enumNumber = enumNumber;
return this;
@@ -449,6 +514,7 @@ public class EnumTest {
return Objects.equals(this.enumString, enumTest.enumString) &&
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
Objects.equals(this.enumIntegerOnly, enumTest.enumIntegerOnly) &&
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
Objects.equals(this.outerEnum, enumTest.outerEnum) &&
Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) &&
@@ -458,7 +524,7 @@ public class EnumTest {
@Override
public int hashCode() {
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
return Objects.hash(enumString, enumStringRequired, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
}
@Override
@@ -468,6 +534,7 @@ public class EnumTest {
sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n");
sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
sb.append(" enumIntegerOnly: ").append(toIndentedString(enumIntegerOnly)).append("\n");
sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
sb.append(" outerEnumInteger: ").append(toIndentedString(outerEnumInteger)).append("\n");

5
samples/openapi3/client/petstore/java/native/api/openapi.yaml
View File

@@ -1689,6 +1689,11 @@ components:
- -1
format: int32
type: integer
enum_integer_only:
enum:
- 2
- -2
type: integer
enum_number:
enum:
- 1.1

10
samples/openapi3/client/petstore/java/native/docs/EnumTest.md
View File

@@ -10,6 +10,7 @@ Name | Type | Description | Notes
**enumString** | [**EnumStringEnum**](#EnumStringEnum) | | [optional]
**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) | |
**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) | | [optional]
**enumIntegerOnly** | [**EnumIntegerOnlyEnum**](#EnumIntegerOnlyEnum) | | [optional]
**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) | | [optional]
**outerEnum** | **OuterEnum** | | [optional]
**outerEnumInteger** | **OuterEnumInteger** | | [optional]
@@ -47,6 +48,15 @@ NUMBER_MINUS_1 | -1
## Enum: EnumIntegerOnlyEnum
Name | Value
---- | -----
NUMBER_2 | 2
NUMBER_MINUS_2 | -2
## Enum: EnumNumberEnum
Name | Value

69
samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
View File

@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
EnumTest.JSON_PROPERTY_ENUM_STRING,
EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
EnumTest.JSON_PROPERTY_ENUM_INTEGER,
EnumTest.JSON_PROPERTY_ENUM_INTEGER_ONLY,
EnumTest.JSON_PROPERTY_ENUM_NUMBER,
EnumTest.JSON_PROPERTY_OUTER_ENUM,
EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER,
@@ -167,6 +168,44 @@ public class EnumTest {
public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
private EnumIntegerEnum enumInteger;
/**
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(2),
NUMBER_MINUS_2(-2);
private Integer value;
EnumIntegerOnlyEnum(Integer value) {
this.value = value;
}
@JsonValue
public Integer getValue() {
return value;
}
@Override
public String toString() {
return String.valueOf(value);
}
@JsonCreator
public static EnumIntegerOnlyEnum fromValue(Integer value) {
for (EnumIntegerOnlyEnum b : EnumIntegerOnlyEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}
public static final String JSON_PROPERTY_ENUM_INTEGER_ONLY = "enum_integer_only";
private EnumIntegerOnlyEnum enumIntegerOnly;
/**
* Gets or Sets enumNumber
*/
@@ -295,6 +334,32 @@ public class EnumTest {
}
public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
this.enumIntegerOnly = enumIntegerOnly;
return this;
}
/**
* Get enumIntegerOnly
* @return enumIntegerOnly
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public EnumIntegerOnlyEnum getEnumIntegerOnly() {
return enumIntegerOnly;
}
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setEnumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
this.enumIntegerOnly = enumIntegerOnly;
}
public EnumTest enumNumber(EnumNumberEnum enumNumber) {
this.enumNumber = enumNumber;
return this;
@@ -448,6 +513,7 @@ public class EnumTest {
return Objects.equals(this.enumString, enumTest.enumString) &&
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
Objects.equals(this.enumIntegerOnly, enumTest.enumIntegerOnly) &&
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
Objects.equals(this.outerEnum, enumTest.outerEnum) &&
Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) &&
@@ -457,7 +523,7 @@ public class EnumTest {
@Override
public int hashCode() {
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
return Objects.hash(enumString, enumStringRequired, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
}
@Override
@@ -467,6 +533,7 @@ public class EnumTest {
sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n");
sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
sb.append(" enumIntegerOnly: ").append(toIndentedString(enumIntegerOnly)).append("\n");
sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
sb.append(" outerEnumInteger: ").append(toIndentedString(outerEnumInteger)).append("\n");