From f333f71778f4025d3c66d907c43620c8110c362e Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 3 Aug 2025 15:12:39 -0400 Subject: [PATCH 1/5] composed enums --- .../languages/AbstractCSharpCodegen.java | 8 + .../generichost/JsonConverter.mustache | 6 +- .../generichost/modelGeneric.mustache | 2 +- ...odels-for-testing-with-http-signature.yaml | 14 + .../FormModels/.openapi-generator/FILES | 9 + .../net4.7/FormModels/api/openapi.yaml | 14 + .../net4.7/FormModels/docs/models/AreaCode.md | 9 + .../FormModels/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../net4.7/Petstore/.openapi-generator/FILES | 9 + .../net4.7/Petstore/api/openapi.yaml | 14 + .../net4.7/Petstore/docs/models/AreaCode.md | 9 + .../Petstore/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../FormModels/.openapi-generator/FILES | 9 + .../net4.8/FormModels/api/openapi.yaml | 14 + .../net4.8/FormModels/docs/models/AreaCode.md | 9 + .../FormModels/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../net4.8/Petstore/.openapi-generator/FILES | 9 + .../net4.8/Petstore/api/openapi.yaml | 14 + .../net4.8/Petstore/docs/models/AreaCode.md | 9 + .../Petstore/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../net8/FormModels/.openapi-generator/FILES | 9 + .../net8/FormModels/api/openapi.yaml | 14 + .../net8/FormModels/docs/models/AreaCode.md | 9 + .../FormModels/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../.openapi-generator/FILES | 9 + .../net8/NullReferenceTypes/api/openapi.yaml | 14 + .../docs/models/AreaCode.md | 9 + .../docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 197 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 176 +++++++++++ .../Model/StateTerritoryCode.cs | 176 +++++++++++ .../net8/Petstore/.openapi-generator/FILES | 9 + .../net8/Petstore/api/openapi.yaml | 14 + .../net8/Petstore/docs/models/AreaCode.md | 9 + .../Petstore/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../SourceGeneration/.openapi-generator/FILES | 9 + .../net8/SourceGeneration/api/openapi.yaml | 14 + .../SourceGeneration/docs/models/AreaCode.md | 9 + .../docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 8 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 205 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 185 +++++++++++ .../Model/StateTerritoryCode.cs | 185 +++++++++++ .../net9/FormModels/.openapi-generator/FILES | 9 + .../net9/FormModels/api/openapi.yaml | 14 + .../net9/FormModels/docs/models/AreaCode.md | 9 + .../FormModels/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../.openapi-generator/FILES | 6 + .../net9/NullReferenceTypes/api/openapi.yaml | 14 + .../docs/models/AreaCode.md | 9 + .../docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 197 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 176 +++++++++++ .../Model/StateTerritoryCode.cs | 176 +++++++++++ .../net9/Petstore/.openapi-generator/FILES | 9 + .../net9/Petstore/api/openapi.yaml | 14 + .../net9/Petstore/docs/models/AreaCode.md | 9 + .../Petstore/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../SourceGeneration/.openapi-generator/FILES | 9 + .../net9/SourceGeneration/api/openapi.yaml | 14 + .../SourceGeneration/docs/models/AreaCode.md | 9 + .../docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 8 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 205 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 185 +++++++++++ .../Model/StateTerritoryCode.cs | 185 +++++++++++ .../Petstore/.openapi-generator/FILES | 9 + .../standard2.0/Petstore/api/openapi.yaml | 14 + .../Petstore/docs/models/AreaCode.md | 9 + .../Petstore/docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 56 ++++ .../Model/MarineAreaCodeTests.cs | 56 ++++ .../Model/StateTerritoryCodeTests.cs | 56 ++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 4 + .../Client/HostConfiguration.cs | 5 + .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ++++++++++ .../Model/StateTerritoryCode.cs | 174 ++++++++++ .../net9/Petstore/.openapi-generator/FILES | 9 + .../csharp/httpclient/net9/Petstore/README.md | 3 + .../httpclient/net9/Petstore/api/openapi.yaml | 14 + .../httpclient/net9/Petstore/docs/AreaCode.md | 9 + .../net9/Petstore/docs/MarineAreaCode.md | 9 + .../net9/Petstore/docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 57 ++++ .../Model/MarineAreaCodeTests.cs | 57 ++++ .../Model/StateTerritoryCodeTests.cs | 57 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 296 ++++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 49 +++ .../Model/StateTerritoryCode.cs | 49 +++ .../Petstore/.openapi-generator/FILES | 9 + .../httpclient/standard2.0/Petstore/README.md | 3 + .../standard2.0/Petstore/api/openapi.yaml | 14 + .../standard2.0/Petstore/docs/AreaCode.md | 9 + .../Petstore/docs/MarineAreaCode.md | 9 + .../Petstore/docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 57 ++++ .../Model/MarineAreaCodeTests.cs | 57 ++++ .../Model/StateTerritoryCodeTests.cs | 57 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 296 ++++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 49 +++ .../Model/StateTerritoryCode.cs | 49 +++ .../net8/Petstore/.openapi-generator/FILES | 9 + .../csharp/restsharp/net8/Petstore/README.md | 3 + .../restsharp/net8/Petstore/api/openapi.yaml | 14 + .../restsharp/net8/Petstore/docs/AreaCode.md | 9 + .../net8/Petstore/docs/MarineAreaCode.md | 9 + .../net8/Petstore/docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 57 ++++ .../Model/MarineAreaCodeTests.cs | 57 ++++ .../Model/StateTerritoryCodeTests.cs | 57 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 295 +++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 48 +++ .../Model/StateTerritoryCode.cs | 48 +++ .../.openapi-generator/FILES | 9 + .../ConditionalSerialization/README.md | 3 + .../ConditionalSerialization/api/openapi.yaml | 14 + .../ConditionalSerialization/docs/AreaCode.md | 9 + .../docs/MarineAreaCode.md | 9 + .../docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 57 ++++ .../Model/MarineAreaCodeTests.cs | 57 ++++ .../Model/StateTerritoryCodeTests.cs | 57 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 295 +++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 48 +++ .../Model/StateTerritoryCode.cs | 48 +++ .../net9/Petstore/.openapi-generator/FILES | 9 + .../unityWebRequest/net9/Petstore/README.md | 3 + .../net9/Petstore/api/openapi.yaml | 14 + .../net9/Petstore/docs/AreaCode.md | 9 + .../net9/Petstore/docs/MarineAreaCode.md | 9 + .../net9/Petstore/docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 58 ++++ .../Model/MarineAreaCodeTests.cs | 58 ++++ .../Model/StateTerritoryCodeTests.cs | 58 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 286 +++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 46 +++ .../Model/StateTerritoryCode.cs | 46 +++ .../Petstore/.openapi-generator/FILES | 9 + .../standard2.0/Petstore/README.md | 3 + .../standard2.0/Petstore/api/openapi.yaml | 14 + .../standard2.0/Petstore/docs/AreaCode.md | 9 + .../Petstore/docs/MarineAreaCode.md | 9 + .../Petstore/docs/StateTerritoryCode.md | 9 + .../Model/AreaCodeTests.cs | 58 ++++ .../Model/MarineAreaCodeTests.cs | 58 ++++ .../Model/StateTerritoryCodeTests.cs | 58 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 286 +++++++++++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 46 +++ .../Model/StateTerritoryCode.cs | 46 +++ 245 files changed, 13791 insertions(+), 4 deletions(-) create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index eac38bf01e46..19dfd1bb120d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -653,6 +653,14 @@ public Map postProcessAllModels(Map objs) property.isNullable = true; patchPropertyVendorExtensions(property); property.vendorExtensions.put("x-base-name", model.name.substring(model.name.lastIndexOf('_') + 1)); + + if (!property.isEnum) { + CodegenModel composedOf = ModelUtils.getModelByName(property.name, processed); + if (composedOf != null) { + property.isEnum = composedOf.isEnum; + patchPropertyVendorExtensions(property); + } + } } } } diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index a416373c9dea..9728ed9cd6fe 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -299,9 +299,9 @@ {{^composedSchemas.oneOf}} {{^required}} {{#model.composedSchemas.anyOf}} - Option<{{baseType}}{{>NullConditionalProperty}}> {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} == null + Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}> {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue = {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} == null ? default - : new Option<{{baseType}}{{>NullConditionalProperty}}>({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}); + : new Option<{{{datatypeWithEnum}}}{{>NullConditionalProperty}}>({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}); {{/model.composedSchemas.anyOf}} {{#-last}} @@ -397,7 +397,7 @@ {{^isPrimitiveType}} { {{datatypeWithEnum}}JsonConverter {{datatypeWithEnum}}JsonConverter = ({{datatypeWithEnum}}JsonConverter) jsonSerializerOptions.Converters.First(c => c.CanConvert({{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}.GetType())); - {{datatypeWithEnum}}JsonConverter.WriteProperties(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{/required}}, jsonSerializerOptions); + {{datatypeWithEnum}}JsonConverter.Write{{^isEnumRef}}Properties{{/isEnumRef}}(writer, {{#lambda.camelcase_sanitize_param}}{{model.classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}, jsonSerializerOptions); } {{/isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache index 587057cddd32..93ca620ddaff 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache @@ -62,7 +62,7 @@ {{^composedSchemas.anyOf}} [JsonConstructor] {{/composedSchemas.anyOf}} - {{#model.vendorExtensions.x-model-is-mutable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutable}}{{^model.vendorExtensions.x-model-is-mutable}}internal{{/model.vendorExtensions.x-model-is-mutable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{baseType}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#model.vendorExtensions.x-model-is-mutable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutable}}{{^model.vendorExtensions.x-model-is-mutable}}internal{{/model.vendorExtensions.x-model-is-mutable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{^required}}Option<{{/required}}{{{datatypeWithEnum}}}{{>NullConditionalProperty}}{{^required}}>{{/required}} {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { {{#composedSchemas.anyOf}} {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}{{^required}}Option{{/required}} = {{#lambda.escape_reserved_word}}{{#lambda.camel_case}}{{name}}{{/lambda.camel_case}}{{/lambda.escape_reserved_word}}; diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 6b565788598b..6040dda7ab51 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -2948,3 +2948,17 @@ components: enum: - APPROVED - MANUAL_APPROVAL_REQUIRED + AreaCode: + oneOf: + - $ref: '#/components/schemas/StateTerritoryCode' + - $ref: '#/components/schemas/MarineAreaCode' + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES index 23707e233f05..28754d7d56df 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -66,6 +67,7 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -115,6 +117,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -140,6 +143,9 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -182,6 +188,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -231,6 +238,7 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -280,6 +288,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml index 98095354ea32..64614fd7c2ac 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml @@ -2700,6 +2700,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 0f6a46e313a2..a5033a09a5b7 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -176,6 +176,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -202,6 +204,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 57b402a3000e..f0a80f9a432a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,6 +46,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -104,6 +105,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -166,6 +169,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES index a6635c9d8351..eb78f1564cc8 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -158,6 +164,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -199,6 +206,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -240,6 +248,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 382636b9c592..01c7a5585901 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,6 +178,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -216,6 +218,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 5d658ec3769d..a1e19dd8691c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,6 +46,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -88,6 +89,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -134,6 +137,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES index 23707e233f05..28754d7d56df 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -66,6 +67,7 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -115,6 +117,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -140,6 +143,9 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -182,6 +188,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -231,6 +238,7 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -280,6 +288,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml index 98095354ea32..64614fd7c2ac 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml @@ -2700,6 +2700,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 0f6a46e313a2..a5033a09a5b7 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -176,6 +176,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -202,6 +204,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 57b402a3000e..f0a80f9a432a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,6 +46,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -104,6 +105,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -166,6 +169,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES index a6635c9d8351..eb78f1564cc8 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -158,6 +164,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -199,6 +206,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -240,6 +248,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 382636b9c592..01c7a5585901 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,6 +178,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -216,6 +218,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 5d658ec3769d..a1e19dd8691c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,6 +46,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -88,6 +89,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -134,6 +137,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES index 8062853cee64..cd4deec21d03 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -66,6 +67,7 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -115,6 +117,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -140,6 +143,9 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -184,6 +190,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -233,6 +240,7 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -282,6 +290,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml index 98095354ea32..64614fd7c2ac 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml @@ -2700,6 +2700,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 895f77e556ba..18f21a2d038f 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -175,6 +175,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -201,6 +203,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 2c2b9348011f..1fa649ec6262 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,6 +48,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -106,6 +107,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -168,6 +171,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES index ab28c754b4b1..0f48a6769cad 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -160,6 +166,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +208,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +250,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs index 8a3b1e1511b2..ded0782e6269 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,6 +179,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,6 +219,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index 7828441b95e5..7ddd57589136 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,6 +50,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -92,6 +93,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -138,6 +141,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..46d79374de0f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,197 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..8087a4e19516 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,176 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..ddfbbf7987a6 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,176 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES index ab28c754b4b1..0f48a6769cad 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -160,6 +166,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +208,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +250,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 91be9bd4c0f8..f74c94b74ece 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -177,6 +177,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -215,6 +217,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index f97fb3c5e7a2..6108f6bc3700 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,6 +48,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -90,6 +91,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -136,6 +139,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES index ab28c754b4b1..0f48a6769cad 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -160,6 +166,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +208,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +250,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs index 8a3b1e1511b2..ded0782e6269 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,6 +179,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,6 +219,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index 759667956526..c5fb2d01760e 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,6 +50,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -92,6 +93,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -138,6 +141,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); @@ -165,6 +170,7 @@ public HostConfiguration(IServiceCollection services) new ApiResponseSerializationContext(), new AppleSerializationContext(), new AppleReqSerializationContext(), + new AreaCodeSerializationContext(), new ArrayOfArrayOfNumberOnlySerializationContext(), new ArrayOfNumberOnlySerializationContext(), new ArrayTestSerializationContext(), @@ -206,6 +212,7 @@ public HostConfiguration(IServiceCollection services) new LiteralStringClassSerializationContext(), new MammalSerializationContext(), new MapTestSerializationContext(), + new MarineAreaCodeSerializationContext(), new MixedAnyOfSerializationContext(), new MixedAnyOfContentSerializationContext(), new MixedOneOfSerializationContext(), @@ -247,6 +254,7 @@ public HostConfiguration(IServiceCollection services) new ShapeOrNullSerializationContext(), new SimpleQuadrilateralSerializationContext(), new SpecialModelNameSerializationContext(), + new StateTerritoryCodeSerializationContext(), new TagSerializationContext(), new TestCollectionEndingWithWordListSerializationContext(), new TestCollectionEndingWithWordListObjectSerializationContext(), diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..3b9b7d6de545 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,205 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } + + /// + /// The AreaCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(AreaCode))] + public partial class AreaCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..7fc39ad189e0 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,185 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } + + + /// + /// The MarineAreaCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(MarineAreaCode))] + public partial class MarineAreaCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..cbc701684f6a --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,185 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } + + + /// + /// The StateTerritoryCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(StateTerritoryCode))] + public partial class StateTerritoryCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES index 8062853cee64..cd4deec21d03 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -66,6 +67,7 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -115,6 +117,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -140,6 +143,9 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -184,6 +190,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -233,6 +240,7 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -282,6 +290,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml index 98095354ea32..64614fd7c2ac 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml @@ -2700,6 +2700,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 895f77e556ba..18f21a2d038f 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -175,6 +175,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -201,6 +203,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 2c2b9348011f..1fa649ec6262 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,6 +48,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -106,6 +107,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -168,6 +171,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES index ab28c754b4b1..5af52a53e935 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -160,6 +163,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +205,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +247,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs index 8a3b1e1511b2..ded0782e6269 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,6 +179,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,6 +219,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index 7828441b95e5..7ddd57589136 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,6 +50,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -92,6 +93,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -138,6 +141,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..46d79374de0f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,197 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..8087a4e19516 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,176 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..ddfbbf7987a6 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,176 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES index ab28c754b4b1..0f48a6769cad 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -160,6 +166,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +208,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +250,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 91be9bd4c0f8..f74c94b74ece 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -177,6 +177,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -215,6 +217,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index f97fb3c5e7a2..6108f6bc3700 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,6 +48,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -90,6 +91,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -136,6 +139,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES index ab28c754b4b1..0f48a6769cad 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -160,6 +166,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -201,6 +208,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -242,6 +250,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs index 8a3b1e1511b2..ded0782e6269 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,6 +179,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,6 +219,8 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index 759667956526..c5fb2d01760e 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,6 +50,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -92,6 +93,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -138,6 +141,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); @@ -165,6 +170,7 @@ public HostConfiguration(IServiceCollection services) new ApiResponseSerializationContext(), new AppleSerializationContext(), new AppleReqSerializationContext(), + new AreaCodeSerializationContext(), new ArrayOfArrayOfNumberOnlySerializationContext(), new ArrayOfNumberOnlySerializationContext(), new ArrayTestSerializationContext(), @@ -206,6 +212,7 @@ public HostConfiguration(IServiceCollection services) new LiteralStringClassSerializationContext(), new MammalSerializationContext(), new MapTestSerializationContext(), + new MarineAreaCodeSerializationContext(), new MixedAnyOfSerializationContext(), new MixedAnyOfContentSerializationContext(), new MixedOneOfSerializationContext(), @@ -247,6 +254,7 @@ public HostConfiguration(IServiceCollection services) new ShapeOrNullSerializationContext(), new SimpleQuadrilateralSerializationContext(), new SpecialModelNameSerializationContext(), + new StateTerritoryCodeSerializationContext(), new TagSerializationContext(), new TestCollectionEndingWithWordListSerializationContext(), new TestCollectionEndingWithWordListObjectSerializationContext(), diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..3b9b7d6de545 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,205 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } + + /// + /// The AreaCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(AreaCode))] + public partial class AreaCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..7fc39ad189e0 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,185 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } + + + /// + /// The MarineAreaCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(MarineAreaCode))] + public partial class MarineAreaCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..cbc701684f6a --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,185 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Text.Json.Serialization.Metadata; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } + + + /// + /// The StateTerritoryCodeSerializationContext + /// + [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] + [JsonSerializable(typeof(StateTerritoryCode))] + public partial class StateTerritoryCodeSerializationContext : JsonSerializerContext { } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES index a6635c9d8351..eb78f1564cc8 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES @@ -17,6 +17,7 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md +docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -58,6 +59,7 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md +docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -99,6 +101,7 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md +docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -116,6 +119,9 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -158,6 +164,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -199,6 +206,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -240,6 +248,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..3e18255d13b5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..af640f3210bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..31a2d6a87427 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 382636b9c592..01c7a5585901 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,6 +178,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -216,6 +218,8 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 5d658ec3769d..a1e19dd8691c 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,6 +46,7 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -88,6 +89,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -134,6 +137,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..d38948bb8a3d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,195 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..2900318bdf7f --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..78d7e1b3dcad --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,174 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES index 5885f8c71756..47f8522704f7 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES @@ -11,6 +11,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -55,6 +56,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,6 +99,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -114,6 +117,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -148,6 +154,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -189,6 +196,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -230,6 +238,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md index 322a7ddd39a2..ec586ab3c3d4 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md @@ -202,6 +202,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) + - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -243,6 +244,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) + - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -284,6 +286,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) + - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..f6cb1401bde2 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..83cc3b268885 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..981c22276931 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..5a8c7394d972 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,296 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..815a8fd10dec --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..6438d98ca736 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES index 8fc05aa72028..96ee378c85cf 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES @@ -11,6 +11,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -55,6 +56,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,6 +99,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -114,6 +117,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs src/Org.OpenAPITools/Api/FakeApi.cs @@ -147,6 +153,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -188,6 +195,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -229,6 +237,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md index 3974e57dfee4..839976a825dc 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md @@ -190,6 +190,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) + - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -231,6 +232,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) + - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -272,6 +274,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) + - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..f6cb1401bde2 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..83cc3b268885 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..981c22276931 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..5a8c7394d972 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,296 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..815a8fd10dec --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..6438d98ca736 --- /dev/null +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES index 0ddde99ff436..93a1864270cc 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES @@ -11,6 +11,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -55,6 +56,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,6 +99,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -114,6 +117,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -150,6 +156,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -191,6 +198,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -232,6 +240,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md index dac7869f82af..94b2c0e56e72 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md @@ -177,6 +177,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) + - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -218,6 +219,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) + - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -259,6 +261,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) + - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..f6cb1401bde2 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..83cc3b268885 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..981c22276931 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..16b72ec9b123 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,295 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..b5dcf1835c8e --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,48 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..f095bce2442a --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,48 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES index 0ddde99ff436..93a1864270cc 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES @@ -11,6 +11,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -55,6 +56,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,6 +99,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -114,6 +117,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -150,6 +156,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -191,6 +198,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -232,6 +240,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md index ca68f7ad0cbd..6846a9b94745 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md @@ -165,6 +165,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) + - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -206,6 +207,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) + - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -247,6 +249,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) + - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..f6cb1401bde2 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..83cc3b268885 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..981c22276931 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,57 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..16b72ec9b123 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,295 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..b5dcf1835c8e --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,48 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..f095bce2442a --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,48 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES index f91fdecb6552..68943f492dff 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES @@ -9,6 +9,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -53,6 +54,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -95,6 +97,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -112,6 +115,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -147,6 +153,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -188,6 +195,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -229,6 +237,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md index da582eff3b39..dc46c69a5325 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md @@ -151,6 +151,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](ApiResponse.md) - [Model.Apple](Apple.md) - [Model.AppleReq](AppleReq.md) + - [Model.AreaCode](AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](ArrayOfNumberOnly.md) - [Model.ArrayTest](ArrayTest.md) @@ -192,6 +193,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](LiteralStringClass.md) - [Model.Mammal](Mammal.md) - [Model.MapTest](MapTest.md) + - [Model.MarineAreaCode](MarineAreaCode.md) - [Model.MixedAnyOf](MixedAnyOf.md) - [Model.MixedAnyOfContent](MixedAnyOfContent.md) - [Model.MixedOneOf](MixedOneOf.md) @@ -233,6 +235,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](ShapeOrNull.md) - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) - [Model.SpecialModelName](SpecialModelName.md) + - [Model.StateTerritoryCode](StateTerritoryCode.md) - [Model.Tag](Tag.md) - [Model.TestCollectionEndingWithWordList](TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..871611f4e0f1 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Test] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..6b461a2ad511 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Test] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..311124073516 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Test] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..071d392bbf96 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,286 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as AreaCode); + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..51f42489782c --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,46 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..9bfc988421a9 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,46 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES index f91fdecb6552..68943f492dff 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES @@ -9,6 +9,7 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md +docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -53,6 +54,7 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md +docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -95,6 +97,7 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md +docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -112,6 +115,9 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -147,6 +153,7 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -188,6 +195,7 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -229,6 +237,7 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md index da582eff3b39..dc46c69a5325 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md @@ -151,6 +151,7 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](ApiResponse.md) - [Model.Apple](Apple.md) - [Model.AppleReq](AppleReq.md) + - [Model.AreaCode](AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](ArrayOfNumberOnly.md) - [Model.ArrayTest](ArrayTest.md) @@ -192,6 +193,7 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](LiteralStringClass.md) - [Model.Mammal](Mammal.md) - [Model.MapTest](MapTest.md) + - [Model.MarineAreaCode](MarineAreaCode.md) - [Model.MixedAnyOf](MixedAnyOf.md) - [Model.MixedAnyOfContent](MixedAnyOfContent.md) - [Model.MixedOneOf](MixedOneOf.md) @@ -233,6 +235,7 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](ShapeOrNull.md) - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) - [Model.SpecialModelName](SpecialModelName.md) + - [Model.StateTerritoryCode](StateTerritoryCode.md) - [Model.Tag](Tag.md) - [Model.TestCollectionEndingWithWordList](TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml index 9d3b1ee3ad39..75f8323aeee3 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml @@ -2881,6 +2881,20 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md new file mode 100644 index 000000000000..22a8a1fc30ff --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md new file mode 100644 index 000000000000..a101c2273ff6 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md new file mode 100644 index 000000000000..1300559945fa --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..871611f4e0f1 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Test] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..6b461a2ad511 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Test] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..311124073516 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,58 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Test] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + + } +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..071d392bbf96 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,286 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + [JsonConverter(typeof(AreaCodeJsonConverter))] + [DataContract(Name = "AreaCode")] + public partial class AreaCode : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of StateTerritoryCode. + public AreaCode(StateTerritoryCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of MarineAreaCode. + public AreaCode(MarineAreaCode actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); + } + } + } + + /// + /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of StateTerritoryCode + public StateTerritoryCode GetStateTerritoryCode() + { + return (StateTerritoryCode)this.ActualInstance; + } + + /// + /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, + /// the InvalidClassException will be thrown + /// + /// An instance of MarineAreaCode + public MarineAreaCode GetMarineAreaCode() + { + return (MarineAreaCode)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of AreaCode + /// + /// JSON string + /// An instance of AreaCode + public static AreaCode FromJson(string jsonString) + { + AreaCode newAreaCode = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newAreaCode; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("MarineAreaCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); + } + else + { + newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("StateTerritoryCode"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newAreaCode; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as AreaCode); + } + + /// + /// Returns true if AreaCode instances are equal + /// + /// Instance of AreaCode to be compared + /// Boolean + public bool Equals(AreaCode input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + } + + /// + /// Custom JSON converter for AreaCode + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + switch(reader.TokenType) + { + case JsonToken.StartObject: + return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); + case JsonToken.StartArray: + return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); + default: + return null; + } + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..51f42489782c --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,46 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + [EnumMember(Value = "AM")] + AM = 1, + + /// + /// Enum AN for value: AN + /// + [EnumMember(Value = "AN")] + AN = 2 + } + +} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..9bfc988421a9 --- /dev/null +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,46 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + [EnumMember(Value = "AL")] + AL = 1, + + /// + /// Enum AK for value: AK + /// + [EnumMember(Value = "AK")] + AK = 2 + } + +} From 8abec7f42e8f606f4428efc77b4e6518c358b8a0 Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 3 Aug 2025 16:03:25 -0400 Subject: [PATCH 2/5] revert sample changes --- .../FormModels/.openapi-generator/FILES | 9 - .../net4.7/FormModels/api/openapi.yaml | 14 - .../net4.7/FormModels/docs/models/AreaCode.md | 9 - .../FormModels/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../net4.7/Petstore/.openapi-generator/FILES | 9 - .../net4.7/Petstore/api/openapi.yaml | 14 - .../net4.7/Petstore/docs/models/AreaCode.md | 9 - .../Petstore/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../FormModels/.openapi-generator/FILES | 9 - .../net4.8/FormModels/api/openapi.yaml | 14 - .../net4.8/FormModels/docs/models/AreaCode.md | 9 - .../FormModels/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../net4.8/Petstore/.openapi-generator/FILES | 9 - .../net4.8/Petstore/api/openapi.yaml | 14 - .../net4.8/Petstore/docs/models/AreaCode.md | 9 - .../Petstore/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../net8/FormModels/.openapi-generator/FILES | 9 - .../net8/FormModels/api/openapi.yaml | 14 - .../net8/FormModels/docs/models/AreaCode.md | 9 - .../FormModels/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../.openapi-generator/FILES | 9 - .../net8/NullReferenceTypes/api/openapi.yaml | 14 - .../docs/models/AreaCode.md | 9 - .../docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 197 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 176 ----------- .../Model/StateTerritoryCode.cs | 176 ----------- .../net8/Petstore/.openapi-generator/FILES | 9 - .../net8/Petstore/api/openapi.yaml | 14 - .../net8/Petstore/docs/models/AreaCode.md | 9 - .../Petstore/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../SourceGeneration/.openapi-generator/FILES | 9 - .../net8/SourceGeneration/api/openapi.yaml | 14 - .../SourceGeneration/docs/models/AreaCode.md | 9 - .../docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 8 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 205 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 185 ----------- .../Model/StateTerritoryCode.cs | 185 ----------- .../net9/FormModels/.openapi-generator/FILES | 9 - .../net9/FormModels/api/openapi.yaml | 14 - .../net9/FormModels/docs/models/AreaCode.md | 9 - .../FormModels/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../.openapi-generator/FILES | 6 - .../net9/NullReferenceTypes/api/openapi.yaml | 14 - .../docs/models/AreaCode.md | 9 - .../docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 197 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 176 ----------- .../Model/StateTerritoryCode.cs | 176 ----------- .../net9/Petstore/.openapi-generator/FILES | 9 - .../net9/Petstore/api/openapi.yaml | 14 - .../net9/Petstore/docs/models/AreaCode.md | 9 - .../Petstore/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../SourceGeneration/.openapi-generator/FILES | 9 - .../net9/SourceGeneration/api/openapi.yaml | 14 - .../SourceGeneration/docs/models/AreaCode.md | 9 - .../docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 8 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 205 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 185 ----------- .../Model/StateTerritoryCode.cs | 185 ----------- .../Petstore/.openapi-generator/FILES | 9 - .../standard2.0/Petstore/api/openapi.yaml | 14 - .../Petstore/docs/models/AreaCode.md | 9 - .../Petstore/docs/models/MarineAreaCode.md | 9 - .../docs/models/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 56 ---- .../Model/MarineAreaCodeTests.cs | 56 ---- .../Model/StateTerritoryCodeTests.cs | 56 ---- .../Org.OpenAPITools/Client/ClientUtils.cs | 4 - .../Client/HostConfiguration.cs | 5 - .../src/Org.OpenAPITools/Model/AreaCode.cs | 195 ------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 174 ---------- .../Model/StateTerritoryCode.cs | 174 ---------- .../net9/Petstore/.openapi-generator/FILES | 9 - .../csharp/httpclient/net9/Petstore/README.md | 3 - .../httpclient/net9/Petstore/api/openapi.yaml | 14 - .../httpclient/net9/Petstore/docs/AreaCode.md | 9 - .../net9/Petstore/docs/MarineAreaCode.md | 9 - .../net9/Petstore/docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 57 ---- .../Model/MarineAreaCodeTests.cs | 57 ---- .../Model/StateTerritoryCodeTests.cs | 57 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 296 ------------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 49 --- .../Model/StateTerritoryCode.cs | 49 --- .../Petstore/.openapi-generator/FILES | 9 - .../httpclient/standard2.0/Petstore/README.md | 3 - .../standard2.0/Petstore/api/openapi.yaml | 14 - .../standard2.0/Petstore/docs/AreaCode.md | 9 - .../Petstore/docs/MarineAreaCode.md | 9 - .../Petstore/docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 57 ---- .../Model/MarineAreaCodeTests.cs | 57 ---- .../Model/StateTerritoryCodeTests.cs | 57 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 296 ------------------ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 49 --- .../Model/StateTerritoryCode.cs | 49 --- .../net8/Petstore/.openapi-generator/FILES | 9 - .../csharp/restsharp/net8/Petstore/README.md | 3 - .../restsharp/net8/Petstore/api/openapi.yaml | 14 - .../restsharp/net8/Petstore/docs/AreaCode.md | 9 - .../net8/Petstore/docs/MarineAreaCode.md | 9 - .../net8/Petstore/docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 57 ---- .../Model/MarineAreaCodeTests.cs | 57 ---- .../Model/StateTerritoryCodeTests.cs | 57 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 295 ----------------- .../Org.OpenAPITools/Model/MarineAreaCode.cs | 48 --- .../Model/StateTerritoryCode.cs | 48 --- .../.openapi-generator/FILES | 9 - .../ConditionalSerialization/README.md | 3 - .../ConditionalSerialization/api/openapi.yaml | 14 - .../ConditionalSerialization/docs/AreaCode.md | 9 - .../docs/MarineAreaCode.md | 9 - .../docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 57 ---- .../Model/MarineAreaCodeTests.cs | 57 ---- .../Model/StateTerritoryCodeTests.cs | 57 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 295 ----------------- .../Org.OpenAPITools/Model/MarineAreaCode.cs | 48 --- .../Model/StateTerritoryCode.cs | 48 --- .../net9/Petstore/.openapi-generator/FILES | 9 - .../unityWebRequest/net9/Petstore/README.md | 3 - .../net9/Petstore/api/openapi.yaml | 14 - .../net9/Petstore/docs/AreaCode.md | 9 - .../net9/Petstore/docs/MarineAreaCode.md | 9 - .../net9/Petstore/docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 58 ---- .../Model/MarineAreaCodeTests.cs | 58 ---- .../Model/StateTerritoryCodeTests.cs | 58 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 286 ----------------- .../Org.OpenAPITools/Model/MarineAreaCode.cs | 46 --- .../Model/StateTerritoryCode.cs | 46 --- .../Petstore/.openapi-generator/FILES | 9 - .../standard2.0/Petstore/README.md | 3 - .../standard2.0/Petstore/api/openapi.yaml | 14 - .../standard2.0/Petstore/docs/AreaCode.md | 9 - .../Petstore/docs/MarineAreaCode.md | 9 - .../Petstore/docs/StateTerritoryCode.md | 9 - .../Model/AreaCodeTests.cs | 58 ---- .../Model/MarineAreaCodeTests.cs | 58 ---- .../Model/StateTerritoryCodeTests.cs | 58 ---- .../src/Org.OpenAPITools/Model/AreaCode.cs | 286 ----------------- .../Org.OpenAPITools/Model/MarineAreaCode.cs | 46 --- .../Model/StateTerritoryCode.cs | 46 --- 241 files changed, 13765 deletions(-) delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs delete mode 100644 samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES index 28754d7d56df..23707e233f05 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -67,7 +66,6 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -117,7 +115,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -143,9 +140,6 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -188,7 +182,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -238,7 +231,6 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -288,7 +280,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml index 64614fd7c2ac..98095354ea32 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml @@ -2700,20 +2700,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index a5033a09a5b7..0f6a46e313a2 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -176,8 +176,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -204,8 +202,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index f0a80f9a432a..57b402a3000e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,7 +46,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -105,8 +104,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -169,8 +166,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES index eb78f1564cc8..a6635c9d8351 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -164,7 +158,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -206,7 +199,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -248,7 +240,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 01c7a5585901..382636b9c592 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,8 +178,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -218,8 +216,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index a1e19dd8691c..5d658ec3769d 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,7 +46,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -89,8 +88,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -137,8 +134,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES index 28754d7d56df..23707e233f05 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -67,7 +66,6 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -117,7 +115,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -143,9 +140,6 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -188,7 +182,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -238,7 +231,6 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -288,7 +280,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml index 64614fd7c2ac..98095354ea32 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml @@ -2700,20 +2700,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index a5033a09a5b7..0f6a46e313a2 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -176,8 +176,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -204,8 +202,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index f0a80f9a432a..57b402a3000e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,7 +46,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -105,8 +104,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -169,8 +166,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES index eb78f1564cc8..a6635c9d8351 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -164,7 +158,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -206,7 +199,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -248,7 +240,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 01c7a5585901..382636b9c592 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,8 +178,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -218,8 +216,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index a1e19dd8691c..5d658ec3769d 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,7 +46,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -89,8 +88,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -137,8 +134,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES index cd4deec21d03..8062853cee64 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -67,7 +66,6 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -117,7 +115,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -143,9 +140,6 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -190,7 +184,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -240,7 +233,6 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -290,7 +282,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml index 64614fd7c2ac..98095354ea32 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml @@ -2700,20 +2700,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 18f21a2d038f..895f77e556ba 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -175,8 +175,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -203,8 +201,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 1fa649ec6262..2c2b9348011f 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,7 +48,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -107,8 +106,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -171,8 +168,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES index 0f48a6769cad..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -166,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -208,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -250,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs index ded0782e6269..8a3b1e1511b2 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,8 +179,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -219,8 +217,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index 7ddd57589136..7828441b95e5 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,7 +50,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -93,8 +92,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -141,8 +138,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 46d79374de0f..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,197 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string? localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 8087a4e19516..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index ddfbbf7987a6..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES index 0f48a6769cad..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -166,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -208,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -250,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index f74c94b74ece..91be9bd4c0f8 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -177,8 +177,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,8 +215,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 6108f6bc3700..f97fb3c5e7a2 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,7 +48,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -91,8 +90,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -139,8 +136,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES index 0f48a6769cad..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -166,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -208,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -250,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs index ded0782e6269..8a3b1e1511b2 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,8 +179,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -219,8 +217,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index c5fb2d01760e..759667956526 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,7 +50,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -93,8 +92,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -141,8 +138,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); @@ -170,7 +165,6 @@ public HostConfiguration(IServiceCollection services) new ApiResponseSerializationContext(), new AppleSerializationContext(), new AppleReqSerializationContext(), - new AreaCodeSerializationContext(), new ArrayOfArrayOfNumberOnlySerializationContext(), new ArrayOfNumberOnlySerializationContext(), new ArrayTestSerializationContext(), @@ -212,7 +206,6 @@ public HostConfiguration(IServiceCollection services) new LiteralStringClassSerializationContext(), new MammalSerializationContext(), new MapTestSerializationContext(), - new MarineAreaCodeSerializationContext(), new MixedAnyOfSerializationContext(), new MixedAnyOfContentSerializationContext(), new MixedOneOfSerializationContext(), @@ -254,7 +247,6 @@ public HostConfiguration(IServiceCollection services) new ShapeOrNullSerializationContext(), new SimpleQuadrilateralSerializationContext(), new SpecialModelNameSerializationContext(), - new StateTerritoryCodeSerializationContext(), new TagSerializationContext(), new TestCollectionEndingWithWordListSerializationContext(), new TestCollectionEndingWithWordListObjectSerializationContext(), diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 3b9b7d6de545..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,205 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string? localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } - - /// - /// The AreaCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(AreaCode))] - public partial class AreaCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 7fc39ad189e0..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,185 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } - - - /// - /// The MarineAreaCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(MarineAreaCode))] - public partial class MarineAreaCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index cbc701684f6a..000000000000 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,185 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } - - - /// - /// The StateTerritoryCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(StateTerritoryCode))] - public partial class StateTerritoryCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES index cd4deec21d03..8062853cee64 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -67,7 +66,6 @@ docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MapTestMapOfEnumStringValue.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -117,7 +115,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -143,9 +140,6 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -190,7 +184,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -240,7 +233,6 @@ src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -290,7 +282,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml index 64614fd7c2ac..98095354ea32 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml @@ -2700,20 +2700,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 18f21a2d038f..895f77e556ba 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -175,8 +175,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner); if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue) return MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is OrderStatus orderStatus) return OrderStatusValueConverter.ToJsonValue(orderStatus); if (obj is OuterEnum outerEnum) @@ -203,8 +201,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString(); if (obj is RequiredClassRequiredNullableEnumString requiredClassRequiredNullableEnumString) return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 1fa649ec6262..2c2b9348011f 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,7 +48,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -107,8 +106,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueJsonConverter()); _jsonOptions.Converters.Add(new MapTestMapOfEnumStringValueNullableJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -171,8 +168,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES index 5af52a53e935..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -163,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -205,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -247,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs index ded0782e6269..8a3b1e1511b2 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,8 +179,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -219,8 +217,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index 7ddd57589136..7828441b95e5 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,7 +50,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -93,8 +92,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -141,8 +138,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 46d79374de0f..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,197 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string? localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 8087a4e19516..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index ddfbbf7987a6..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES index 0f48a6769cad..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -166,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -208,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -250,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index f74c94b74ece..91be9bd4c0f8 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -177,8 +177,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -217,8 +215,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 6108f6bc3700..f97fb3c5e7a2 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -48,7 +48,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -91,8 +90,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -139,8 +136,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES index 0f48a6769cad..ab28c754b4b1 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -166,7 +160,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -208,7 +201,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -250,7 +242,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs index ded0782e6269..8a3b1e1511b2 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -179,8 +179,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -219,8 +217,6 @@ public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOp return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index c5fb2d01760e..759667956526 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -50,7 +50,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -93,8 +92,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -141,8 +138,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); @@ -170,7 +165,6 @@ public HostConfiguration(IServiceCollection services) new ApiResponseSerializationContext(), new AppleSerializationContext(), new AppleReqSerializationContext(), - new AreaCodeSerializationContext(), new ArrayOfArrayOfNumberOnlySerializationContext(), new ArrayOfNumberOnlySerializationContext(), new ArrayTestSerializationContext(), @@ -212,7 +206,6 @@ public HostConfiguration(IServiceCollection services) new LiteralStringClassSerializationContext(), new MammalSerializationContext(), new MapTestSerializationContext(), - new MarineAreaCodeSerializationContext(), new MixedAnyOfSerializationContext(), new MixedAnyOfContentSerializationContext(), new MixedOneOfSerializationContext(), @@ -254,7 +247,6 @@ public HostConfiguration(IServiceCollection services) new ShapeOrNullSerializationContext(), new SimpleQuadrilateralSerializationContext(), new SpecialModelNameSerializationContext(), - new StateTerritoryCodeSerializationContext(), new TagSerializationContext(), new TestCollectionEndingWithWordListSerializationContext(), new TestCollectionEndingWithWordListObjectSerializationContext(), diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 3b9b7d6de545..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,205 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string? localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } - - /// - /// The AreaCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(AreaCode))] - public partial class AreaCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 7fc39ad189e0..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,185 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } - - - /// - /// The MarineAreaCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(MarineAreaCode))] - public partial class MarineAreaCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index cbc701684f6a..000000000000 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,185 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -#nullable enable - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Text.Json.Serialization.Metadata; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string? rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } - - - /// - /// The StateTerritoryCodeSerializationContext - /// - [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)] - [JsonSerializable(typeof(StateTerritoryCode))] - public partial class StateTerritoryCodeSerializationContext : JsonSerializerContext { } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES index eb78f1564cc8..a6635c9d8351 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES @@ -17,7 +17,6 @@ docs/models/Animal.md docs/models/ApiResponse.md docs/models/Apple.md docs/models/AppleReq.md -docs/models/AreaCode.md docs/models/ArrayOfArrayOfNumberOnly.md docs/models/ArrayOfNumberOnly.md docs/models/ArrayTest.md @@ -59,7 +58,6 @@ docs/models/List.md docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md -docs/models/MarineAreaCode.md docs/models/MixedAnyOf.md docs/models/MixedAnyOfContent.md docs/models/MixedOneOf.md @@ -101,7 +99,6 @@ docs/models/ShapeInterface.md docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md -docs/models/StateTerritoryCode.md docs/models/Tag.md docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md @@ -119,9 +116,6 @@ docs/models/ZeroBasedEnumClass.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -164,7 +158,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -206,7 +199,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -248,7 +240,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md deleted file mode 100644 index 5b0ff4118cb8..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md deleted file mode 100644 index 465bd2634535..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md deleted file mode 100644 index dc34cc4285b4..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) - diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 3e18255d13b5..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index af640f3210bb..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 31a2d6a87427..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs index 01c7a5585901..382636b9c592 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -178,8 +178,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); if (obj is MapTest.InnerEnum mapTestInnerEnum) return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); - if (obj is MarineAreaCode marineAreaCode) - return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); if (obj is Order.StatusEnum orderStatusEnum) return Order.StatusEnumToJsonValue(orderStatusEnum); if (obj is OuterEnum outerEnum) @@ -218,8 +216,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClass.RequiredNullableEnumIntegerOnlyEnumToJsonValue(requiredClassRequiredNullableEnumIntegerOnlyEnum).ToString(); if (obj is RequiredClass.RequiredNullableEnumStringEnum requiredClassRequiredNullableEnumStringEnum) return RequiredClass.RequiredNullableEnumStringEnumToJsonValue(requiredClassRequiredNullableEnumStringEnum); - if (obj is StateTerritoryCode stateTerritoryCode) - return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); if (obj is TestDescendants.ObjectTypeEnum testDescendantsObjectTypeEnum) return TestDescendants.ObjectTypeEnumToJsonValue(testDescendantsObjectTypeEnum); if (obj is TestResultCode testResultCode) diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index a1e19dd8691c..5d658ec3769d 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -46,7 +46,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ApiResponseJsonConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AppleReqJsonConverter()); - _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayOfNumberOnlyJsonConverter()); _jsonOptions.Converters.Add(new ArrayTestJsonConverter()); @@ -89,8 +88,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); - _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfJsonConverter()); _jsonOptions.Converters.Add(new MixedAnyOfContentJsonConverter()); _jsonOptions.Converters.Add(new MixedOneOfJsonConverter()); @@ -137,8 +134,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); - _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index d38948bb8a3d..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - public partial class AreaCode : IValidatableObject - { - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(StateTerritoryCode stateTerritoryCode) - { - StateTerritoryCode = stateTerritoryCode; - OnCreated(); - } - - /// - /// Initializes a new instance of the class. - /// - /// - internal AreaCode(MarineAreaCode marineAreaCode) - { - MarineAreaCode = marineAreaCode; - OnCreated(); - } - - partial void OnCreated(); - - /// - /// Gets or Sets StateTerritoryCode - /// - public StateTerritoryCode? StateTerritoryCode { get; set; } - - /// - /// Gets or Sets MarineAreaCode - /// - public MarineAreaCode? MarineAreaCode { get; set; } - - /// - /// Gets or Sets additional properties - /// - [JsonExtensionData] - public Dictionary AdditionalProperties { get; } = new Dictionary(); - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// A Json converter for type - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// Deserializes json to - /// - /// - /// - /// - /// - /// - public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) - { - int currentDepth = utf8JsonReader.CurrentDepth; - - if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) - throw new JsonException(); - - JsonTokenType startingTokenType = utf8JsonReader.TokenType; - - StateTerritoryCode? stateTerritoryCode = default; - MarineAreaCode? marineAreaCode = default; - - Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; - while (utf8JsonReaderOneOf.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) - break; - - if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) - { - Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); - - Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; - ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); - } - } - - while (utf8JsonReader.Read()) - { - if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) - break; - - if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) - { - string localVarJsonPropertyName = utf8JsonReader.GetString(); - utf8JsonReader.Read(); - - switch (localVarJsonPropertyName) - { - default: - break; - } - } - } - - if (stateTerritoryCode != null) - return new AreaCode(stateTerritoryCode.Value); - - if (marineAreaCode != null) - return new AreaCode(marineAreaCode.Value); - - throw new JsonException(); - } - - /// - /// Serializes a - /// - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - writer.WriteStartObject(); - - WriteProperties(writer, areaCode, jsonSerializerOptions); - writer.WriteEndObject(); - } - - /// - /// Serializes the properties of - /// - /// - /// - /// - /// - public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) - { - - } - } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 2900318bdf7f..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - AM = 1, - - /// - /// Enum AN for value: AN - /// - AN = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class MarineAreaCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode FromString(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static MarineAreaCode? FromStringOrDefault(string value) - { - if (value.Equals("AM")) - return MarineAreaCode.AM; - - if (value.Equals("AN")) - return MarineAreaCode.AN; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(MarineAreaCode value) - { - if (value == MarineAreaCode.AM) - return "AM"; - - if (value == MarineAreaCode.AN) - return "AN"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class MarineAreaCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the MarineAreaCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class MarineAreaCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a MarineAreaCode from the Json object - /// - /// - /// - /// - /// - public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - MarineAreaCode? result = rawValue == null - ? null - : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) - { - writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 78d7e1b3dcad..000000000000 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,174 +0,0 @@ -// -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.ComponentModel.DataAnnotations; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using Org.OpenAPITools.Client; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - AL = 1, - - /// - /// Enum AK for value: AK - /// - AK = 2 - } - - /// - /// Converts to and from the JSON value - /// - public static class StateTerritoryCodeValueConverter - { - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode FromString(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); - } - - /// - /// Parses a given value to - /// - /// - /// - public static StateTerritoryCode? FromStringOrDefault(string value) - { - if (value.Equals("AL")) - return StateTerritoryCode.AL; - - if (value.Equals("AK")) - return StateTerritoryCode.AK; - - return null; - } - - /// - /// Converts the to the json value - /// - /// - /// - /// - public static string ToJsonValue(StateTerritoryCode value) - { - if (value == StateTerritoryCode.AL) - return "AL"; - - if (value == StateTerritoryCode.AK) - return "AK"; - - throw new NotImplementedException($"Value could not be handled: '{value}'"); - } - } - - /// - /// A Json converter for type - /// - /// - public class StateTerritoryCodeJsonConverter : JsonConverter - { - /// - /// Returns a from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the StateTerritoryCode to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode.ToString()); - } - } - - /// - /// A Json converter for type - /// - public class StateTerritoryCodeNullableJsonConverter : JsonConverter - { - /// - /// Returns a StateTerritoryCode from the Json object - /// - /// - /// - /// - /// - public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string rawValue = reader.GetString(); - - StateTerritoryCode? result = rawValue == null - ? null - : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); - - if (result != null) - return result.Value; - - throw new JsonException(); - } - - /// - /// Writes the DateTime to the json writer - /// - /// - /// - /// - public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) - { - writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES index 47f8522704f7..5885f8c71756 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/.openapi-generator/FILES @@ -11,7 +11,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -56,7 +55,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -99,7 +97,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -117,9 +114,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -154,7 +148,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -196,7 +189,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -238,7 +230,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md index ec586ab3c3d4..322a7ddd39a2 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/README.md @@ -202,7 +202,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) - - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -244,7 +243,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -286,7 +284,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index f6cb1401bde2..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 83cc3b268885..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 981c22276931..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 5a8c7394d972..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,296 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 815a8fd10dec..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 6438d98ca736..000000000000 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES index 96ee378c85cf..8fc05aa72028 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/.openapi-generator/FILES @@ -11,7 +11,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -56,7 +55,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -99,7 +97,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -117,9 +114,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs src/Org.OpenAPITools/Api/FakeApi.cs @@ -153,7 +147,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -195,7 +188,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -237,7 +229,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md index 839976a825dc..3974e57dfee4 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/README.md @@ -190,7 +190,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) - - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -232,7 +231,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -274,7 +272,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index f6cb1401bde2..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 83cc3b268885..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 981c22276931..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 5a8c7394d972..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,296 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 815a8fd10dec..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 6438d98ca736..000000000000 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Org.OpenAPITools.Client.FileParameter; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES index 93a1864270cc..0ddde99ff436 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/.openapi-generator/FILES @@ -11,7 +11,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -56,7 +55,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -99,7 +97,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -117,9 +114,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -156,7 +150,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -198,7 +191,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -240,7 +232,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md index 94b2c0e56e72..dac7869f82af 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/README.md @@ -177,7 +177,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) - - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -219,7 +218,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -261,7 +259,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index f6cb1401bde2..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 83cc3b268885..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 981c22276931..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 16b72ec9b123..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,295 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index b5dcf1835c8e..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index f095bce2442a..000000000000 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES index 93a1864270cc..0ddde99ff436 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/.openapi-generator/FILES @@ -11,7 +11,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -56,7 +55,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -99,7 +97,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -117,9 +114,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -156,7 +150,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -198,7 +191,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -240,7 +232,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md index 6846a9b94745..ca68f7ad0cbd 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/README.md @@ -165,7 +165,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](docs/ApiResponse.md) - [Model.Apple](docs/Apple.md) - [Model.AppleReq](docs/AppleReq.md) - - [Model.AreaCode](docs/AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Model.ArrayTest](docs/ArrayTest.md) @@ -207,7 +206,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - - [Model.MarineAreaCode](docs/MarineAreaCode.md) - [Model.MixedAnyOf](docs/MixedAnyOf.md) - [Model.MixedAnyOfContent](docs/MixedAnyOfContent.md) - [Model.MixedOneOf](docs/MixedOneOf.md) @@ -249,7 +247,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](docs/ShapeOrNull.md) - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - - [Model.StateTerritoryCode](docs/StateTerritoryCode.md) - [Model.Tag](docs/Tag.md) - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index f6cb1401bde2..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Fact] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 83cc3b268885..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Fact] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 981c22276931..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using Xunit; - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Fact] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - } -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 16b72ec9b123..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,295 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable, IValidatableObject - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input as AreaCode).AreEqual; - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index b5dcf1835c8e..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index f095bce2442a..000000000000 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES index 68943f492dff..f91fdecb6552 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/.openapi-generator/FILES @@ -9,7 +9,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -54,7 +53,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,7 +95,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -115,9 +112,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -153,7 +147,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -195,7 +188,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -237,7 +229,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md index dc46c69a5325..da582eff3b39 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/README.md @@ -151,7 +151,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](ApiResponse.md) - [Model.Apple](Apple.md) - [Model.AppleReq](AppleReq.md) - - [Model.AreaCode](AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](ArrayOfNumberOnly.md) - [Model.ArrayTest](ArrayTest.md) @@ -193,7 +192,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](LiteralStringClass.md) - [Model.Mammal](Mammal.md) - [Model.MapTest](MapTest.md) - - [Model.MarineAreaCode](MarineAreaCode.md) - [Model.MixedAnyOf](MixedAnyOf.md) - [Model.MixedAnyOfContent](MixedAnyOfContent.md) - [Model.MixedOneOf](MixedOneOf.md) @@ -235,7 +233,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](ShapeOrNull.md) - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) - [Model.SpecialModelName](SpecialModelName.md) - - [Model.StateTerritoryCode](StateTerritoryCode.md) - [Model.Tag](Tag.md) - [Model.TestCollectionEndingWithWordList](TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 871611f4e0f1..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Test] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 6b461a2ad511..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Test] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 311124073516..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Test] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 071d392bbf96..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,286 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return this.Equals(input as AreaCode); - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - if (input == null) - return false; - - return this.ActualInstance.Equals(input.ActualInstance); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 51f42489782c..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 9bfc988421a9..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES index 68943f492dff..f91fdecb6552 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/.openapi-generator/FILES @@ -9,7 +9,6 @@ docs/AnotherFakeApi.md docs/ApiResponse.md docs/Apple.md docs/AppleReq.md -docs/AreaCode.md docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md @@ -54,7 +53,6 @@ docs/List.md docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md -docs/MarineAreaCode.md docs/MixedAnyOf.md docs/MixedAnyOfContent.md docs/MixedOneOf.md @@ -97,7 +95,6 @@ docs/ShapeInterface.md docs/ShapeOrNull.md docs/SimpleQuadrilateral.md docs/SpecialModelName.md -docs/StateTerritoryCode.md docs/StoreApi.md docs/Tag.md docs/TestCollectionEndingWithWordList.md @@ -115,9 +112,6 @@ docs/Zebra.md docs/ZeroBasedEnum.md docs/ZeroBasedEnumClass.md git_push.sh -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef src/Org.OpenAPITools/Api/AnotherFakeApi.cs src/Org.OpenAPITools/Api/DefaultApi.cs @@ -153,7 +147,6 @@ src/Org.OpenAPITools/Model/Animal.cs src/Org.OpenAPITools/Model/ApiResponse.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/AppleReq.cs -src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs src/Org.OpenAPITools/Model/ArrayTest.cs @@ -195,7 +188,6 @@ src/Org.OpenAPITools/Model/List.cs src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs -src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/MixedAnyOf.cs src/Org.OpenAPITools/Model/MixedAnyOfContent.cs src/Org.OpenAPITools/Model/MixedOneOf.cs @@ -237,7 +229,6 @@ src/Org.OpenAPITools/Model/ShapeInterface.cs src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs -src/Org.OpenAPITools/Model/StateTerritoryCode.cs src/Org.OpenAPITools/Model/Tag.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md index dc46c69a5325..da582eff3b39 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/README.md @@ -151,7 +151,6 @@ Class | Method | HTTP request | Description - [Model.ApiResponse](ApiResponse.md) - [Model.Apple](Apple.md) - [Model.AppleReq](AppleReq.md) - - [Model.AreaCode](AreaCode.md) - [Model.ArrayOfArrayOfNumberOnly](ArrayOfArrayOfNumberOnly.md) - [Model.ArrayOfNumberOnly](ArrayOfNumberOnly.md) - [Model.ArrayTest](ArrayTest.md) @@ -193,7 +192,6 @@ Class | Method | HTTP request | Description - [Model.LiteralStringClass](LiteralStringClass.md) - [Model.Mammal](Mammal.md) - [Model.MapTest](MapTest.md) - - [Model.MarineAreaCode](MarineAreaCode.md) - [Model.MixedAnyOf](MixedAnyOf.md) - [Model.MixedAnyOfContent](MixedAnyOfContent.md) - [Model.MixedOneOf](MixedOneOf.md) @@ -235,7 +233,6 @@ Class | Method | HTTP request | Description - [Model.ShapeOrNull](ShapeOrNull.md) - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) - [Model.SpecialModelName](SpecialModelName.md) - - [Model.StateTerritoryCode](StateTerritoryCode.md) - [Model.Tag](Tag.md) - [Model.TestCollectionEndingWithWordList](TestCollectionEndingWithWordList.md) - [Model.TestCollectionEndingWithWordListObject](TestCollectionEndingWithWordListObject.md) diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml index 75f8323aeee3..9d3b1ee3ad39 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml @@ -2881,20 +2881,6 @@ components: - APPROVED - MANUAL_APPROVAL_REQUIRED type: string - AreaCode: - oneOf: - - $ref: "#/components/schemas/StateTerritoryCode" - - $ref: "#/components/schemas/MarineAreaCode" - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md deleted file mode 100644 index 22a8a1fc30ff..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/AreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.AreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md deleted file mode 100644 index a101c2273ff6..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/MarineAreaCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.MarineAreaCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md deleted file mode 100644 index 1300559945fa..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/docs/StateTerritoryCode.md +++ /dev/null @@ -1,9 +0,0 @@ -# Org.OpenAPITools.Model.StateTerritoryCode - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs deleted file mode 100644 index 871611f4e0f1..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing AreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class AreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for AreaCode - //private AreaCode instance; - - public AreaCodeTests() - { - // TODO uncomment below to create an instance of AreaCode - //instance = new AreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of AreaCode - /// - [Test] - public void AreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" AreaCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs deleted file mode 100644 index 6b461a2ad511..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing MarineAreaCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class MarineAreaCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for MarineAreaCode - //private MarineAreaCode instance; - - public MarineAreaCodeTests() - { - // TODO uncomment below to create an instance of MarineAreaCode - //instance = new MarineAreaCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of MarineAreaCode - /// - [Test] - public void MarineAreaCodeInstanceTest() - { - // TODO uncomment below to test "IsType" MarineAreaCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs deleted file mode 100644 index 311124073516..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Model; -using Org.OpenAPITools.Client; -using System.Reflection; -using Newtonsoft.Json; -using NUnit.Framework; - -namespace Org.OpenAPITools.Test.Model -{ - /// - /// Class for testing StateTerritoryCode - /// - /// - /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). - /// Please update the test case below to test the model. - /// - public class StateTerritoryCodeTests : IDisposable - { - // TODO uncomment below to declare an instance variable for StateTerritoryCode - //private StateTerritoryCode instance; - - public StateTerritoryCodeTests() - { - // TODO uncomment below to create an instance of StateTerritoryCode - //instance = new StateTerritoryCode(); - } - - public void Dispose() - { - // Cleanup when everything is done. - } - - /// - /// Test an instance of StateTerritoryCode - /// - [Test] - public void StateTerritoryCodeInstanceTest() - { - // TODO uncomment below to test "IsType" StateTerritoryCode - //Assert.IsType(instance); - } - - } -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs deleted file mode 100644 index 071d392bbf96..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/AreaCode.cs +++ /dev/null @@ -1,286 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; -using System.Reflection; - -namespace Org.OpenAPITools.Model -{ - /// - /// AreaCode - /// - [JsonConverter(typeof(AreaCodeJsonConverter))] - [DataContract(Name = "AreaCode")] - public partial class AreaCode : AbstractOpenAPISchema, IEquatable - { - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of StateTerritoryCode. - public AreaCode(StateTerritoryCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - /// - /// Initializes a new instance of the class - /// with the class - /// - /// An instance of MarineAreaCode. - public AreaCode(MarineAreaCode actualInstance) - { - this.IsNullable = false; - this.SchemaType= "oneOf"; - this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); - } - - - private Object _actualInstance; - - /// - /// Gets or Sets ActualInstance - /// - public override Object ActualInstance - { - get - { - return _actualInstance; - } - set - { - if (value.GetType() == typeof(MarineAreaCode) || value is MarineAreaCode) - { - this._actualInstance = value; - } - else if (value.GetType() == typeof(StateTerritoryCode) || value is StateTerritoryCode) - { - this._actualInstance = value; - } - else - { - throw new ArgumentException("Invalid instance found. Must be the following types: MarineAreaCode, StateTerritoryCode"); - } - } - } - - /// - /// Get the actual instance of `StateTerritoryCode`. If the actual instance is not `StateTerritoryCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of StateTerritoryCode - public StateTerritoryCode GetStateTerritoryCode() - { - return (StateTerritoryCode)this.ActualInstance; - } - - /// - /// Get the actual instance of `MarineAreaCode`. If the actual instance is not `MarineAreaCode`, - /// the InvalidClassException will be thrown - /// - /// An instance of MarineAreaCode - public MarineAreaCode GetMarineAreaCode() - { - return (MarineAreaCode)this.ActualInstance; - } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class AreaCode {\n"); - sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public override string ToJson() - { - return JsonConvert.SerializeObject(this.ActualInstance, AreaCode.SerializerSettings); - } - - /// - /// Converts the JSON string into an instance of AreaCode - /// - /// JSON string - /// An instance of AreaCode - public static AreaCode FromJson(string jsonString) - { - AreaCode newAreaCode = null; - - if (string.IsNullOrEmpty(jsonString)) - { - return newAreaCode; - } - int match = 0; - List matchedTypes = new List(); - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(MarineAreaCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("MarineAreaCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into MarineAreaCode: {1}", jsonString, exception.ToString())); - } - - try - { - // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize - if (typeof(StateTerritoryCode).GetProperty("AdditionalProperties") == null) - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.SerializerSettings)); - } - else - { - newAreaCode = new AreaCode(JsonConvert.DeserializeObject(jsonString, AreaCode.AdditionalPropertiesSerializerSettings)); - } - matchedTypes.Add("StateTerritoryCode"); - match++; - } - catch (Exception exception) - { - // deserialization failed, try the next one - System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into StateTerritoryCode: {1}", jsonString, exception.ToString())); - } - - if (match == 0) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); - } - else if (match > 1) - { - throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + String.Join(",", matchedTypes)); - } - - // deserialization is considered successful at this point if no exception has been thrown. - return newAreaCode; - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object input) - { - return this.Equals(input as AreaCode); - } - - /// - /// Returns true if AreaCode instances are equal - /// - /// Instance of AreaCode to be compared - /// Boolean - public bool Equals(AreaCode input) - { - if (input == null) - return false; - - return this.ActualInstance.Equals(input.ActualInstance); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - int hashCode = 41; - if (this.ActualInstance != null) - hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); - return hashCode; - } - } - } - - /// - /// Custom JSON converter for AreaCode - /// - public class AreaCodeJsonConverter : JsonConverter - { - /// - /// To write the JSON string - /// - /// JSON writer - /// Object to be converted into a JSON string - /// JSON Serializer - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - writer.WriteRawValue((string)(typeof(AreaCode).GetMethod("ToJson").Invoke(value, null))); - } - - /// - /// To convert a JSON string into an object - /// - /// JSON reader - /// Object type - /// Existing value - /// JSON Serializer - /// The object converted from the JSON string - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - switch(reader.TokenType) - { - case JsonToken.StartObject: - return AreaCode.FromJson(JObject.Load(reader).ToString(Formatting.None)); - case JsonToken.StartArray: - return AreaCode.FromJson(JArray.Load(reader).ToString(Formatting.None)); - default: - return null; - } - } - - /// - /// Check if the object can be converted - /// - /// Object type - /// True if the object can be converted - public override bool CanConvert(Type objectType) - { - return false; - } - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs deleted file mode 100644 index 51f42489782c..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines MarineAreaCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum MarineAreaCode - { - /// - /// Enum AM for value: AM - /// - [EnumMember(Value = "AM")] - AM = 1, - - /// - /// Enum AN for value: AN - /// - [EnumMember(Value = "AN")] - AN = 2 - } - -} diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs deleted file mode 100644 index 9bfc988421a9..000000000000 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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: \" \\ - * - * The version of the OpenAPI document: 1.0.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; - -namespace Org.OpenAPITools.Model -{ - /// - /// Defines StateTerritoryCode - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum StateTerritoryCode - { - /// - /// Enum AL for value: AL - /// - [EnumMember(Value = "AL")] - AL = 1, - - /// - /// Enum AK for value: AK - /// - [EnumMember(Value = "AK")] - AK = 2 - } - -} From 75de51cfeb951df8a23f02cac5276055aa6637b3 Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 3 Aug 2025 16:04:00 -0400 Subject: [PATCH 3/5] add new sample due to HttpClient library not working with the new models --- .github/workflows/samples-dotnet9.yaml | 1 + ...sharp-generichost-latest-composedEnum.yaml | 10 + .../resources/3_0/csharp/composed-enum.yaml | 17 + ...odels-for-testing-with-http-signature.yaml | 14 - .../latest/ComposedEnum/.gitignore | 362 ++++++++++++++++++ .../ComposedEnum/.openapi-generator-ignore | 23 ++ .../ComposedEnum/.openapi-generator/FILES | 45 +++ .../ComposedEnum/.openapi-generator/VERSION | 1 + .../latest/ComposedEnum/Org.OpenAPITools.sln | 27 ++ .../generichost/latest/ComposedEnum/README.md | 2 + .../latest/ComposedEnum/api/openapi.yaml | 24 ++ .../latest/ComposedEnum/appveyor.yml | 9 + .../ComposedEnum/docs/models/AreaCode.md | 9 + .../docs/models/MarineAreaCode.md | 9 + .../docs/models/StateTerritoryCode.md | 9 + .../ComposedEnum/docs/scripts/git_push.ps1 | 75 ++++ .../ComposedEnum/docs/scripts/git_push.sh | 49 +++ .../Org.OpenAPITools.Test/Api/ApiTestsBase.cs | 58 +++ .../Api/DependencyInjectionTests.cs | 99 +++++ .../Model/AreaCodeTests.cs | 56 +++ .../Model/MarineAreaCodeTests.cs | 56 +++ .../Model/StateTerritoryCodeTests.cs | 56 +++ .../Org.OpenAPITools.Test.csproj | 20 + .../src/Org.OpenAPITools.Test/README.md | 0 .../src/Org.OpenAPITools/Api/IApi.cs | 15 + .../Org.OpenAPITools/Client/ApiException.cs | 52 +++ .../src/Org.OpenAPITools/Client/ApiFactory.cs | 49 +++ .../Client/ApiResponseEventArgs.cs | 24 ++ .../Org.OpenAPITools/Client/ApiResponse`1.cs | 152 ++++++++ .../Org.OpenAPITools/Client/ClientUtils.cs | 312 +++++++++++++++ .../Client/CookieContainer.cs | 20 + .../Client/DateOnlyJsonConverter.cs | 61 +++ .../Client/DateOnlyNullableJsonConverter.cs | 66 ++++ .../Client/DateTimeJsonConverter.cs | 75 ++++ .../Client/DateTimeNullableJsonConverter.cs | 80 ++++ .../Client/ExceptionEventArgs.cs | 24 ++ .../Client/HostConfiguration.cs | 134 +++++++ .../Client/JsonSerializerOptionsProvider.cs | 27 ++ .../src/Org.OpenAPITools/Client/Option.cs | 53 +++ .../Client/RateLimitProvider`1.cs | 58 +++ .../src/Org.OpenAPITools/Client/TokenBase.cs | 71 ++++ .../Client/TokenContainer`1.cs | 37 ++ .../Client/TokenProvider`1.cs | 44 +++ .../Extensions/IHostBuilderExtensions.cs | 59 +++ .../IHttpClientBuilderExtensions.cs | 79 ++++ .../IServiceCollectionExtensions.cs | 73 ++++ .../src/Org.OpenAPITools/Model/AreaCode.cs | 189 +++++++++ .../Org.OpenAPITools/Model/MarineAreaCode.cs | 175 +++++++++ .../Model/StateTerritoryCode.cs | 175 +++++++++ .../Org.OpenAPITools/Org.OpenAPITools.csproj | 31 ++ .../src/Org.OpenAPITools/README.md | 108 ++++++ 51 files changed, 3260 insertions(+), 14 deletions(-) create mode 100644 bin/configs/csharp-generichost-latest-composedEnum.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/.gitignore create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator-ignore create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/VERSION create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/Org.OpenAPITools.sln create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/README.md create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/api/openapi.yaml create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/appveyor.yml create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/AreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/MarineAreaCode.md create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/StateTerritoryCode.md create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.ps1 create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.sh create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/README.md create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Api/IApi.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiException.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiFactory.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponse`1.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/CookieContainer.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/Option.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenContainer`1.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Org.OpenAPITools.csproj create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/README.md diff --git a/.github/workflows/samples-dotnet9.yaml b/.github/workflows/samples-dotnet9.yaml index 3bf261cdecea..e35fcc2befe0 100644 --- a/.github/workflows/samples-dotnet9.yaml +++ b/.github/workflows/samples-dotnet9.yaml @@ -23,6 +23,7 @@ jobs: fail-fast: false matrix: sample: + - samples/client/petstore/csharp/generichost/latest/ComposedEnum - samples/client/petstore/csharp/generichost/latest/Tags - samples/client/petstore/csharp/generichost/latest/HelloWorld - samples/client/petstore/csharp/generichost/latest/OneOfList diff --git a/bin/configs/csharp-generichost-latest-composedEnum.yaml b/bin/configs/csharp-generichost-latest-composedEnum.yaml new file mode 100644 index 000000000000..cfd9c37e7541 --- /dev/null +++ b/bin/configs/csharp-generichost-latest-composedEnum.yaml @@ -0,0 +1,10 @@ +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/generichost/latest/ComposedEnum +inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp +additionalProperties: + packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' + modelPropertySorting: alphabetical + operationParameterSorting: alphabetical +validateSpec: false diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml new file mode 100644 index 000000000000..081f044b8c62 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml @@ -0,0 +1,17 @@ +openapi: 3.0.0 +components: + schemas: + AreaCode: + oneOf: + - $ref: '#/components/schemas/StateTerritoryCode' + - $ref: '#/components/schemas/MarineAreaCode' + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 6040dda7ab51..6b565788598b 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -2948,17 +2948,3 @@ components: enum: - APPROVED - MANUAL_APPROVAL_REQUIRED - AreaCode: - oneOf: - - $ref: '#/components/schemas/StateTerritoryCode' - - $ref: '#/components/schemas/MarineAreaCode' - StateTerritoryCode: - enum: - - AL - - AK - type: string - MarineAreaCode: - enum: - - AM - - AN - type: string diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.gitignore b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.gitignore new file mode 100644 index 000000000000..1ee53850b84c --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.gitignore @@ -0,0 +1,362 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES new file mode 100644 index 000000000000..b40fe17be173 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES @@ -0,0 +1,45 @@ +.gitignore +.openapi-generator-ignore +Org.OpenAPITools.sln +README.md +api/openapi.yaml +appveyor.yml +docs/models/AreaCode.md +docs/models/MarineAreaCode.md +docs/models/StateTerritoryCode.md +docs/scripts/git_push.ps1 +docs/scripts/git_push.sh +src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs +src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs +src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +src/Org.OpenAPITools.Test/README.md +src/Org.OpenAPITools/Api/IApi.cs +src/Org.OpenAPITools/Client/ApiException.cs +src/Org.OpenAPITools/Client/ApiFactory.cs +src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs +src/Org.OpenAPITools/Client/ApiResponse`1.cs +src/Org.OpenAPITools/Client/ClientUtils.cs +src/Org.OpenAPITools/Client/CookieContainer.cs +src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs +src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs +src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +src/Org.OpenAPITools/Client/ExceptionEventArgs.cs +src/Org.OpenAPITools/Client/HostConfiguration.cs +src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs +src/Org.OpenAPITools/Client/Option.cs +src/Org.OpenAPITools/Client/RateLimitProvider`1.cs +src/Org.OpenAPITools/Client/TokenBase.cs +src/Org.OpenAPITools/Client/TokenContainer`1.cs +src/Org.OpenAPITools/Client/TokenProvider`1.cs +src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs +src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs +src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Model/AreaCode.cs +src/Org.OpenAPITools/Model/MarineAreaCode.cs +src/Org.OpenAPITools/Model/StateTerritoryCode.cs +src/Org.OpenAPITools/Org.OpenAPITools.csproj +src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/VERSION new file mode 100644 index 000000000000..fc74d6ceba8e --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.15.0-SNAPSHOT diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/Org.OpenAPITools.sln new file mode 100644 index 000000000000..5b15451c9dcf --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/Org.OpenAPITools.sln @@ -0,0 +1,27 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools.Test", "src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {321C8C3F-0156-40C1-AE42-D59761FB9B6C}.Release|Any CPU.Build.0 = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/README.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/README.md new file mode 100644 index 000000000000..334b39306832 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/README.md @@ -0,0 +1,2 @@ +# Created with Openapi Generator +See the project's [REAMDE](src/Org.OpenAPITools/README.md) \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/api/openapi.yaml b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/api/openapi.yaml new file mode 100644 index 000000000000..1f84136ce5b7 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/api/openapi.yaml @@ -0,0 +1,24 @@ +openapi: 3.0.0 +info: + description: OpenAPI + title: OpenAPI + version: 0.0.1 +servers: +- url: / +components: + schemas: + AreaCode: + oneOf: + - $ref: "#/components/schemas/StateTerritoryCode" + - $ref: "#/components/schemas/MarineAreaCode" + StateTerritoryCode: + enum: + - AL + - AK + type: string + MarineAreaCode: + enum: + - AM + - AN + type: string + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/appveyor.yml b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/appveyor.yml new file mode 100644 index 000000000000..f76f63cee506 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/appveyor.yml @@ -0,0 +1,9 @@ +# auto-generated by OpenAPI Generator (https://github.com/OpenAPITools/openapi-generator) +# +image: Visual Studio 2019 +clone_depth: 1 +build_script: +- dotnet build -c Release +- dotnet test -c Release +after_build: +- dotnet pack .\src\Org.OpenAPITools\Org.OpenAPITools.csproj -o ../../output -c Release --no-build diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/AreaCode.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/AreaCode.md new file mode 100644 index 000000000000..5b0ff4118cb8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/AreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/MarineAreaCode.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/MarineAreaCode.md new file mode 100644 index 000000000000..465bd2634535 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/MarineAreaCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.MarineAreaCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/StateTerritoryCode.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/StateTerritoryCode.md new file mode 100644 index 000000000000..dc34cc4285b4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/models/StateTerritoryCode.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.StateTerritoryCode + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.ps1 new file mode 100644 index 000000000000..73ed35c2bb10 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.ps1 @@ -0,0 +1,75 @@ +param( + [Parameter()][Alias("g")][String]$GitHost = "github.com", + [Parameter()][Alias("u")][String]$GitUserId = "GIT_USER_ID", + [Parameter()][Alias("r")][String]$GitRepoId = "GIT_REPO_ID", + [Parameter()][Alias("m")][string]$Message = "Minor update", + [Parameter()][Alias("h")][switch]$Help +) + +function Publish-ToGitHost{ + if ([string]::IsNullOrWhiteSpace($Message) -or $Message -eq "Minor update"){ + # it seems unlikely that we would want our git commit message to be the default, so lets prompt the user + $Message = Read-Host -Prompt "Please provide a commit message or press enter" + $Message = if([string]::IsNullOrWhiteSpace($Message)) { "no message provided" } else { $Message } + } + + git init + git add . + git commit -am "${Message}" + $branchName=$(git rev-parse --abbrev-ref HEAD) + $gitRemote=$(git remote) + + if([string]::IsNullOrWhiteSpace($gitRemote)){ + git remote add origin https://${GitHost}/${GitUserId}/${GitRepoId}.git + } + + Write-Output "Pulling from https://${GitHost}/${GitUserId}/${GitRepoId}.git" + git pull origin $branchName --ff-only + + if ($LastExitCode -ne 0){ + if (${GitHost} -eq "github.com"){ + Write-Output "The ${GitRepoId} repository may not exist yet. Creating it now with the GitHub CLI." + gh auth login --hostname github.com --web + gh repo create $GitRepoId --private + # sleep 2 seconds to ensure git finishes creation of the repo + Start-Sleep -Seconds 2 + } + else{ + throw "There was an issue pulling the origin branch. The remote repository may not exist yet." + } + } + + Write-Output "Pushing to https://${GitHost}/${GitUserId}/${GitRepoId}.git" + git push origin $branchName +} + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 3.0 + +if ($Help){ + Write-Output " + This script will initialize a git repository, then add and commit all files. + The local repository will then be pushed to your preferred git provider. + If the remote repository does not exist yet and you are using GitHub, + the repository will be created for you provided you have the GitHub CLI installed. + + Parameters: + -g | -GitHost -> ex: github.com + -m | -Message -> the git commit message + -r | -GitRepoId -> the name of the repository + -u | -GitUserId -> your user id + " + + return +} + +$rootPath=Resolve-Path -Path $PSScriptRoot/../.. + +Push-Location $rootPath + +try { + Publish-ToGitHost $GitHost $GitUserId $GitRepoId $Message +} +finally{ + Pop-Location +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.sh new file mode 100644 index 000000000000..882104922184 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/docs/scripts/git_push.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=${1:-GIT_USER_ID} +git_repo_id=${2:-GIT_REPO_ID} +release_note=${3:-Minor update} +git_host=${4:-github.com} + +starting_directory=$(pwd) +script_root="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +cd $script_root +cd ../.. + +if [ "$release_note" = "" ] || [ "$release_note" = "Minor update" ]; then + # it seems unlikely that we would want our git commit message to be the default, so lets prompt the user + echo "Please provide a commit message or press enter" + read user_input + release_note=$user_input + if [ "$release_note" = "" ]; then + release_note="no message provided" + fi +fi + +git init +git add . +git commit -am "$release_note" +branch_name=$(git rev-parse --abbrev-ref HEAD) +git_remote=$(git remote) + +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +echo "[INFO] Pulling from https://${git_host}/${git_user_id}/${git_repo_id}.git" +git pull origin $branch_name --ff-only + +echo "[INFO] Pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin $branch_name + +cd $starting_directory diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs new file mode 100644 index 000000000000..d217d4eee5e8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -0,0 +1,58 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections.Generic; +using System.Security.Cryptography; +using Microsoft.Extensions.Hosting; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Extensions; + + +/* ********************************************************************************* +* Follow these manual steps to construct tests. +* This file will not be overwritten. +* ********************************************************************************* +* 1. Navigate to ApiTests.Base.cs and ensure any tokens are being created correctly. +* Take care not to commit credentials to any repository. +* +* 2. Mocking is coordinated by ApiTestsBase#AddApiHttpClients. +* To mock the client, use the generic AddApiHttpClients. +* To mock the server, change the client's BaseAddress. +* +* 3. Locate the test you want below +* - remove the skip property from the Fact attribute +* - set the value of any variables if necessary +* +* 4. Run the tests and ensure they work. +* +*/ + + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Base class for API tests + /// + public class ApiTestsBase + { + protected readonly IHost _host; + + public ApiTestsBase(string[] args) + { + _host = CreateHostBuilder(args).Build(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureApi((context, services, options) => + { + + }); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs new file mode 100644 index 000000000000..ebaf7adb27da --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -0,0 +1,99 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.DependencyInjection; +using System.Collections.Generic; +using System.Security.Cryptography; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Extensions; +using Xunit; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Tests the dependency injection. + /// + public class DependencyInjectionTest + { + private readonly IHost _hostUsingConfigureWithoutAClient = + Host.CreateDefaultBuilder([]).ConfigureApi((context, services, options) => + { + + }) + .Build(); + + private readonly IHost _hostUsingConfigureWithAClient = + Host.CreateDefaultBuilder([]).ConfigureApi((context, services, options) => + { + + options.AddApiHttpClients(client => client.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS)); + }) + .Build(); + + private readonly IHost _hostUsingAddWithoutAClient = + Host.CreateDefaultBuilder([]).ConfigureServices((host, services) => + { + services.AddApi(options => + { + + }); + }) + .Build(); + + private readonly IHost _hostUsingAddWithAClient = + Host.CreateDefaultBuilder([]).ConfigureServices((host, services) => + { + services.AddApi(options => + { + + options.AddApiHttpClients(client => client.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS)); + }); + }) + .Build(); + + /// + /// Test dependency injection when using the configure method + /// + [Fact] + public void ConfigureApiWithAClientTest() + { + + } + + /// + /// Test dependency injection when using the configure method + /// + [Fact] + public void ConfigureApiWithoutAClientTest() + { + + } + + /// + /// Test dependency injection when using the add method + /// + [Fact] + public void AddApiWithAClientTest() + { + + } + + /// + /// Test dependency injection when using the add method + /// + [Fact] + public void AddApiWithoutAClientTest() + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs new file mode 100644 index 000000000000..33afefd52bac --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AreaCode + //private AreaCode instance; + + public AreaCodeTests() + { + // TODO uncomment below to create an instance of AreaCode + //instance = new AreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AreaCode + /// + [Fact] + public void AreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" AreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs new file mode 100644 index 000000000000..38788c14b973 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs @@ -0,0 +1,56 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MarineAreaCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MarineAreaCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MarineAreaCode + //private MarineAreaCode instance; + + public MarineAreaCodeTests() + { + // TODO uncomment below to create an instance of MarineAreaCode + //instance = new MarineAreaCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MarineAreaCode + /// + [Fact] + public void MarineAreaCodeInstanceTest() + { + // TODO uncomment below to test "IsType" MarineAreaCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs new file mode 100644 index 000000000000..fae3a6139483 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs @@ -0,0 +1,56 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing StateTerritoryCode + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class StateTerritoryCodeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for StateTerritoryCode + //private StateTerritoryCode instance; + + public StateTerritoryCodeTests() + { + // TODO uncomment below to create an instance of StateTerritoryCode + //instance = new StateTerritoryCode(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StateTerritoryCode + /// + [Fact] + public void StateTerritoryCodeInstanceTest() + { + // TODO uncomment below to test "IsType" StateTerritoryCode + //Assert.IsType(instance); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj new file mode 100644 index 000000000000..c8ce9246ba83 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -0,0 +1,20 @@ + + + + Org.OpenAPITools.Test + Org.OpenAPITools.Test + net9.0 + false + enable + + + + + + + + + + + + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools.Test/README.md new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Api/IApi.cs new file mode 100644 index 000000000000..28520f043f2d --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Api/IApi.cs @@ -0,0 +1,15 @@ +using System.Net.Http; + +namespace Org.OpenAPITools.Api +{ + /// + /// Any Api client + /// + public interface IApi + { + /// + /// The HttpClient + /// + HttpClient HttpClient { get; } + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiException.cs new file mode 100644 index 000000000000..54060b846443 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiException.cs @@ -0,0 +1,52 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// API Exception + /// + public class ApiException : Exception + { + /// + /// The reason the api request failed + /// + public string? ReasonPhrase { get; } + + /// + /// The HttpStatusCode + /// + public System.Net.HttpStatusCode StatusCode { get; } + + /// + /// The raw data returned by the api + /// + public string RawContent { get; } + + /// + /// Construct the ApiException from parts of the response + /// + /// + /// + /// + public ApiException(string? reasonPhrase, System.Net.HttpStatusCode statusCode, string rawContent) : base(reasonPhrase ?? rawContent) + { + ReasonPhrase = reasonPhrase; + + StatusCode = statusCode; + + RawContent = rawContent; + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiFactory.cs new file mode 100644 index 000000000000..b9b27c613f86 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using Org.OpenAPITools.Api; + +namespace Org.OpenAPITools.Client +{ + /// + /// An IApiFactory interface + /// + public interface IApiFactory + { + /// + /// A method to create an IApi of type IResult + /// + /// + /// + IResult Create() where IResult : IApi; + } + + /// + /// An ApiFactory + /// + public class ApiFactory : IApiFactory + { + /// + /// The service provider + /// + public IServiceProvider Services { get; } + + /// + /// Initializes a new instance of the class. + /// + /// + public ApiFactory(IServiceProvider services) + { + Services = services; + } + + /// + /// A method to create an IApi of type IResult + /// + /// + /// + public IResult Create() where IResult : IApi + { + return Services.GetRequiredService(); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs new file mode 100644 index 000000000000..3cb65e5adc0b --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs @@ -0,0 +1,24 @@ +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// Useful for tracking server health + /// + public class ApiResponseEventArgs : EventArgs + { + /// + /// The ApiResponse + /// + public ApiResponse ApiResponse { get; } + + /// + /// The ApiResponseEventArgs + /// + /// + public ApiResponseEventArgs(ApiResponse apiResponse) + { + ApiResponse = apiResponse; + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponse`1.cs new file mode 100644 index 000000000000..33c67fdf4b52 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -0,0 +1,152 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Diagnostics.CodeAnalysis; +using System.Net; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides a non-generic contract for the ApiResponse wrapper. + /// + public partial interface IApiResponse + { + /// + /// The IsSuccessStatusCode from the api response + /// + bool IsSuccessStatusCode { get; } + + /// + /// Gets the status code (HTTP status code) + /// + /// The status code. + HttpStatusCode StatusCode { get; } + + /// + /// The raw content of this response. + /// + string RawContent { get; } + + /// + /// The DateTime when the request was retrieved. + /// + DateTime DownloadedAt { get; } + + /// + /// The headers contained in the api response + /// + System.Net.Http.Headers.HttpResponseHeaders Headers { get; } + + /// + /// The path used when making the request. + /// + string Path { get; } + + /// + /// The reason phrase contained in the api response + /// + string? ReasonPhrase { get; } + + /// + /// The DateTime when the request was sent. + /// + DateTime RequestedAt { get; } + + /// + /// The Uri used when making the request. + /// + Uri? RequestUri { get; } + } + + /// + /// API Response + /// + public partial class ApiResponse : IApiResponse + { + /// + /// Gets the status code (HTTP status code) + /// + /// The status code. + public HttpStatusCode StatusCode { get; } + + /// + /// The raw data + /// + public string RawContent { get; protected set; } + + /// + /// The IsSuccessStatusCode from the api response + /// + public bool IsSuccessStatusCode { get; } + + /// + /// The reason phrase contained in the api response + /// + public string? ReasonPhrase { get; } + + /// + /// The headers contained in the api response + /// + public System.Net.Http.Headers.HttpResponseHeaders Headers { get; } + + /// + /// The DateTime when the request was retrieved. + /// + public DateTime DownloadedAt { get; } = DateTime.UtcNow; + + /// + /// The DateTime when the request was sent. + /// + public DateTime RequestedAt { get; } + + /// + /// The path used when making the request. + /// + public string Path { get; } + + /// + /// The Uri used when making the request. + /// + public Uri? RequestUri { get; } + + /// + /// The + /// + protected System.Text.Json.JsonSerializerOptions _jsonSerializerOptions; + + /// + /// Construct the response using an HttpResponseMessage + /// + /// + /// + /// + /// + /// + /// + public ApiResponse(global::System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) + { + StatusCode = httpResponseMessage.StatusCode; + Headers = httpResponseMessage.Headers; + IsSuccessStatusCode = httpResponseMessage.IsSuccessStatusCode; + ReasonPhrase = httpResponseMessage.ReasonPhrase; + RawContent = rawContent; + Path = path; + RequestUri = httpRequestMessage.RequestUri; + RequestedAt = requestedAt; + _jsonSerializerOptions = jsonSerializerOptions; + OnCreated(httpRequestMessage, httpResponseMessage); + } + + partial void OnCreated(global::System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs new file mode 100644 index 000000000000..90d10488d811 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -0,0 +1,312 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.IO; +using System.Linq; +using System.Collections; +using System.Collections.Generic; +using System.Text; +using System.Text.Json; +using System.Text.RegularExpressions; +using Org.OpenAPITools.Model; +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Org.OpenAPITools.Test")] + +namespace Org.OpenAPITools.Client +{ + /// + /// Utility functions providing some benefit to API client consumers. + /// + public static partial class ClientUtils + { + + /// + /// A delegate for events. + /// + /// + /// + /// + /// + public delegate void EventHandler(object sender, T e) where T : EventArgs; + + /// + /// Returns true when deserialization succeeds. + /// + /// + /// + /// + /// + /// + public static bool TryDeserialize(string json, JsonSerializerOptions options, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? result) + { + try + { + result = JsonSerializer.Deserialize(json, options); + return result != null; + } + catch (Exception) + { + result = default; + return false; + } + } + + /// + /// Returns true when deserialization succeeds. + /// + /// + /// + /// + /// + /// + public static bool TryDeserialize(ref Utf8JsonReader reader, JsonSerializerOptions options, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? result) + { + try + { + result = JsonSerializer.Deserialize(ref reader, options); + return result != null; + } + catch (Exception) + { + result = default; + return false; + } + } + + /// + /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime. + /// If parameter is a list, join the list with ",". + /// Otherwise just return the string. + /// + /// The parameter (header, path, query, form). + /// The DateTime serialization format. + /// Formatted string. + public static string? ParameterToString(object? obj, string? format = ISO8601_DATETIME_FORMAT) + { + if (obj is DateTime dateTime) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTime.ToString(format); + if (obj is DateTimeOffset dateTimeOffset) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTimeOffset.ToString(format); + if (obj is DateOnly dateOnly) + return dateOnly.ToString(format); + if (obj is bool boolean) + return boolean + ? "true" + : "false"; + if (obj is MarineAreaCode marineAreaCode) + return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode); + if (obj is StateTerritoryCode stateTerritoryCode) + return StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode); + if (obj is ICollection collection) + { + List entries = new(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } + + return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); + } + + /// + /// URL encode a string + /// Credit/Ref: https://github.com/restsharp/RestSharp/blob/master/RestSharp/Extensions/StringExtensions.cs#L50 + /// + /// string to be URL encoded + /// Byte array + public static string UrlEncode(string input) + { + const int maxLength = 32766; + + if (input == null) + { + throw new ArgumentNullException("input"); + } + + if (input.Length <= maxLength) + { + return Uri.EscapeDataString(input); + } + + StringBuilder sb = new StringBuilder(input.Length * 2); + int index = 0; + + while (index < input.Length) + { + int length = Math.Min(input.Length - index, maxLength); + string subString = input.Substring(index, length); + + sb.Append(Uri.EscapeDataString(subString)); + index += subString.Length; + } + + return sb.ToString(); + } + + /// + /// Encode string in base64 format. + /// + /// string to be encoded. + /// Encoded string. + public static string Base64Encode(string text) + { + return Convert.ToBase64String(global::System.Text.Encoding.UTF8.GetBytes(text)); + } + + /// + /// Convert stream to byte array + /// + /// Input stream to be converted + /// Byte array + public static byte[] ReadAsBytes(Stream inputStream) + { + using (var ms = new MemoryStream()) + { + inputStream.CopyTo(ms); + return ms.ToArray(); + } + } + + /// + /// 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' + /// + /// The Content-Type array to select from. + /// The Content-Type header to use. + public static string? SelectHeaderContentType(string[] contentTypes) + { + if (contentTypes.Length == 0) + return null; + + foreach (var contentType in contentTypes) + { + if (IsJsonMime(contentType)) + return contentType; + } + + return contentTypes[0]; // use the first content type specified in 'consumes' + } + + /// + /// 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) + /// + /// The accepts array to select from. + /// The Accept header to use. + 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); + } + + /// + /// Provides a case-insensitive check that a provided content type is a known JSON-like content type. + /// + [GeneratedRegex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$")] + private static partial Regex JsonRegex(); + + /// + /// Check if the given MIME is a JSON MIME. + /// JSON MIME examples: + /// application/json + /// application/json; charset=UTF8 + /// APPLICATION/JSON + /// application/vnd.company+json + /// + /// MIME + /// Returns True if MIME type is json. + public static bool IsJsonMime(string mime) + { + if (string.IsNullOrWhiteSpace(mime)) return false; + + return JsonRegex().IsMatch(mime) || mime.Equals("application/json-patch+json"); + } + + /// + /// Get the discriminator + /// + /// + /// + /// + /// + public static string? GetDiscriminator(Utf8JsonReader utf8JsonReader, string discriminator) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + if (localVarJsonPropertyName != null && localVarJsonPropertyName.Equals(discriminator)) + return utf8JsonReader.GetString(); + } + } + + throw new JsonException("The specified discriminator was not found."); + } + + /// + /// The base path of the API + /// + public const string BASE_ADDRESS = "http://localhost"; + + /// + /// The scheme of the API + /// + public const string SCHEME = "http"; + + /// + /// The context path of the API + /// + public const string CONTEXT_PATH = ""; + + /// + /// The host of the API + /// + public const string HOST = "localhost"; + + /// + /// The format to use for DateTime serialization + /// + public const string ISO8601_DATETIME_FORMAT = "o"; + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/CookieContainer.cs new file mode 100644 index 000000000000..85093b0c1fee --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/CookieContainer.cs @@ -0,0 +1,20 @@ +// + +#nullable enable + +using System.Linq; +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// A class containing a CookieContainer + /// + public sealed class CookieContainer + { + /// + /// The collection of tokens + /// + public System.Net.CookieContainer Value { get; } = new System.Net.CookieContainer(); + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs new file mode 100644 index 000000000000..fbbfa1bc4561 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs @@ -0,0 +1,61 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Globalization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class DateOnlyJsonConverter : JsonConverter + { + /// + /// The formats used to deserialize the date + /// + public static string[] Formats { get; } = { + "yyyy'-'MM'-'dd", + "yyyyMMdd" + + }; + + /// + /// Returns a DateOnly from the Json object + /// + /// + /// + /// + /// + public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + throw new NotSupportedException(); + + string value = reader.GetString()!; + + foreach(string format in Formats) + if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result)) + return result; + + throw new NotSupportedException(); + } + + /// + /// Writes the DateOnly to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) => + writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs new file mode 100644 index 000000000000..781bae3e4967 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs @@ -0,0 +1,66 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Globalization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class DateOnlyNullableJsonConverter : JsonConverter + { + /// + /// The formats used to deserialize the date + /// + public static string[] Formats { get; } = { + "yyyy'-'MM'-'dd", + "yyyyMMdd" + + }; + + /// + /// Returns a DateOnly from the Json object + /// + /// + /// + /// + /// + public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + + string value = reader.GetString()!; + + foreach(string format in Formats) + if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result)) + return result; + + throw new NotSupportedException(); + } + + /// + /// Writes the DateOnly to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options) + { + if (dateOnlyValue == null) + writer.WriteNullValue(); + else + writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture)); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs new file mode 100644 index 000000000000..fb4e686974d1 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -0,0 +1,75 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Globalization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class DateTimeJsonConverter : JsonConverter + { + /// + /// The formats used to deserialize the date + /// + public static string[] Formats { get; } = { + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ssK", + "yyyyMMddTHHmmss.fffffffK", + "yyyyMMddTHHmmss.ffffffK", + "yyyyMMddTHHmmss.fffffK", + "yyyyMMddTHHmmss.ffffK", + "yyyyMMddTHHmmss.fffK", + "yyyyMMddTHHmmss.ffK", + "yyyyMMddTHHmmss.fK", + "yyyyMMddTHHmmssK", + + }; + + /// + /// Returns a DateTime from the Json object + /// + /// + /// + /// + /// + public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + throw new NotSupportedException(); + + string value = reader.GetString()!; + + foreach(string format in Formats) + if (DateTime.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime result)) + return result; + + throw new NotSupportedException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs new file mode 100644 index 000000000000..5f6b23204145 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Globalization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class DateTimeNullableJsonConverter : JsonConverter + { + /// + /// The formats used to deserialize the date + /// + public static string[] Formats { get; } = { + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK", + "yyyy'-'MM'-'dd'T'HH':'mm':'ssK", + "yyyyMMddTHHmmss.fffffffK", + "yyyyMMddTHHmmss.ffffffK", + "yyyyMMddTHHmmss.fffffK", + "yyyyMMddTHHmmss.ffffK", + "yyyyMMddTHHmmss.fffK", + "yyyyMMddTHHmmss.ffK", + "yyyyMMddTHHmmss.fK", + "yyyyMMddTHHmmssK", + + }; + + /// + /// Returns a DateTime from the Json object + /// + /// + /// + /// + /// + public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + + string value = reader.GetString()!; + + foreach(string format in Formats) + if (DateTime.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime result)) + return result; + + return null; + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, DateTime? dateTimeValue, JsonSerializerOptions options) + { + if (dateTimeValue == null) + writer.WriteNullValue(); + else + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs new file mode 100644 index 000000000000..f711f9f3c7ee --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs @@ -0,0 +1,24 @@ +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// Useful for tracking server health + /// + public class ExceptionEventArgs : EventArgs + { + /// + /// The ApiResponse + /// + public Exception Exception { get; } + + /// + /// The ExceptionEventArgs + /// + /// + public ExceptionEventArgs(Exception exception) + { + Exception = exception; + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs new file mode 100644 index 000000000000..1d16263bfe42 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -0,0 +1,134 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Net.Http; +using Microsoft.Extensions.DependencyInjection; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides hosting configuration for Org.OpenAPITools + /// + public class HostConfiguration + { + private readonly IServiceCollection _services; + private readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions(); + + internal bool HttpClientsAdded { get; private set; } + + /// + /// Instantiates the class + /// + /// + public HostConfiguration(IServiceCollection services) + { + _services = services; + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); + _jsonOptions.Converters.Add(new DateTimeJsonConverter()); + _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter()); + _jsonOptions.Converters.Add(new DateOnlyJsonConverter()); + _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter()); + _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); + _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); + _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); + _services.AddSingleton(); + } + + /// + /// Configures the HttpClients. + /// + /// + /// + /// + public HostConfiguration AddApiHttpClients + ( + Action? client = null, Action? builder = null) + { + if (client == null) + client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS); + + List builders = new List(); + + + if (builder != null) + foreach (IHttpClientBuilder instance in builders) + builder(instance); + + HttpClientsAdded = true; + + return this; + } + + /// + /// Configures the JsonSerializerSettings + /// + /// + /// + public HostConfiguration ConfigureJsonOptions(Action options) + { + options(_jsonOptions); + + return this; + } + + /// + /// Adds tokens to your IServiceCollection + /// + /// + /// + /// + public HostConfiguration AddTokens(TTokenBase token) where TTokenBase : TokenBase + { + return AddTokens(new TTokenBase[]{ token }); + } + + /// + /// Adds tokens to your IServiceCollection + /// + /// + /// + /// + public HostConfiguration AddTokens(IEnumerable tokens) where TTokenBase : TokenBase + { + TokenContainer container = new TokenContainer(tokens); + _services.AddSingleton(services => container); + + return this; + } + + /// + /// Adds a token provider to your IServiceCollection + /// + /// + /// + /// + public HostConfiguration UseProvider() + where TTokenProvider : TokenProvider + where TTokenBase : TokenBase + { + _services.AddSingleton(); + _services.AddSingleton>(services => services.GetRequiredService()); + + return this; + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs new file mode 100644 index 000000000000..0184d9ad9446 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs @@ -0,0 +1,27 @@ +// + +#nullable enable + +using System.Text.Json; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides the JsonSerializerOptions + /// + public class JsonSerializerOptionsProvider + { + /// + /// the JsonSerializerOptions + /// + public JsonSerializerOptions Options { get; } + + /// + /// Instantiates a JsonSerializerOptionsProvider + /// + public JsonSerializerOptionsProvider(JsonSerializerOptions options) + { + Options = options; + } + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/Option.cs new file mode 100644 index 000000000000..3b1ef8139066 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/Option.cs @@ -0,0 +1,53 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + + +namespace Org.OpenAPITools.Client +{ + /// + /// A wrapper for operation parameters which are not required + /// + public struct Option + { + /// + /// The value to send to the server + /// + public TType Value { get; } + + /// + /// When true the value will be sent to the server + /// + internal bool IsSet { get; } + + /// + /// A wrapper for operation parameters which are not required + /// + /// + public Option(TType value) + { + IsSet = true; + Value = value; + } + + /// + /// Implicitly converts this option to the contained type + /// + /// + public static implicit operator TType(Option option) => option.Value; + + /// + /// Implicitly converts the provided value to an Option + /// + /// + public static implicit operator Option(TType value) => new Option(value); + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs new file mode 100644 index 000000000000..6fb9a04f0788 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs @@ -0,0 +1,58 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides a token to the api clients. Tokens will be rate limited based on the provided TimeSpan. + /// + /// + public class RateLimitProvider : TokenProvider where TTokenBase : TokenBase + { + internal Dictionary> AvailableTokens { get; } = new(); + + /// + /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout. + /// + /// + public RateLimitProvider(TokenContainer container) : base(container.Tokens) + { + foreach(TTokenBase token in _tokens) + token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40)); + + global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length) + { + FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite + }; + + AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded(options)); + + foreach (var availableToken in AvailableTokens) + foreach(TTokenBase token in _tokens) + { + token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender)); + } + } + + internal override async System.Threading.Tasks.ValueTask GetAsync(string header = "", System.Threading.CancellationToken cancellation = default) + { + if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel? tokens)) + throw new KeyNotFoundException($"Could not locate a token for header '{header}'."); + + return await tokens.Reader.ReadAsync(cancellation).ConfigureAwait(false); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs new file mode 100644 index 000000000000..3f713a2ef4bb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs @@ -0,0 +1,71 @@ +// + +#nullable enable + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// The base for all tokens. + /// + public abstract class TokenBase + { + private DateTime _nextAvailable = DateTime.UtcNow; + private object _nextAvailableLock = new object(); + private readonly System.Timers.Timer _timer = new System.Timers.Timer(); + + + internal TimeSpan? Timeout { get; set; } + internal delegate void TokenBecameAvailableEventHandler(object sender); + internal event TokenBecameAvailableEventHandler? TokenBecameAvailable; + + + /// + /// Initialize a TokenBase object. + /// + /// + internal TokenBase(TimeSpan? timeout = null) + { + Timeout = timeout; + + if (Timeout != null) + StartTimer(Timeout.Value); + } + + + /// + /// Starts the token's timer + /// + /// + internal void StartTimer(TimeSpan timeout) + { + Timeout = timeout; + _timer.Interval = Timeout.Value.TotalMilliseconds; + _timer.Elapsed += OnTimer; + _timer.AutoReset = true; + _timer.Start(); + } + + /// + /// Returns true while the token is rate limited. + /// + public bool IsRateLimited => _nextAvailable > DateTime.UtcNow; + + /// + /// Triggered when the server returns status code TooManyRequests + /// Once triggered the local timeout will be extended an arbitrary length of time. + /// + public void BeginRateLimit() + { + lock(_nextAvailableLock) + _nextAvailable = DateTime.UtcNow.AddSeconds(5); + } + + private void OnTimer(object? sender, System.Timers.ElapsedEventArgs e) + { + if (TokenBecameAvailable != null && !IsRateLimited) + TokenBecameAvailable.Invoke(this); + } + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenContainer`1.cs new file mode 100644 index 000000000000..7b0f23d28a4e --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenContainer`1.cs @@ -0,0 +1,37 @@ +// + +#nullable enable + +using System.Linq; +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// A container for a collection of tokens. + /// + /// + public sealed class TokenContainer where TTokenBase : TokenBase + { + /// + /// The collection of tokens + /// + public List Tokens { get; } = new List(); + + /// + /// Instantiates a TokenContainer + /// + public TokenContainer() + { + } + + /// + /// Instantiates a TokenContainer + /// + /// + public TokenContainer(global::System.Collections.Generic.IEnumerable tokens) + { + Tokens = tokens.ToList(); + } + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs new file mode 100644 index 000000000000..3d8a2168d4ff --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs @@ -0,0 +1,44 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Linq; +using System.Collections.Generic; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools +{ + /// + /// A class which will provide tokens. + /// + public abstract class TokenProvider where TTokenBase : TokenBase + { + /// + /// The array of tokens. + /// + protected TTokenBase[] _tokens; + + internal abstract System.Threading.Tasks.ValueTask GetAsync(string header = "", System.Threading.CancellationToken cancellation = default); + + /// + /// Instantiates a TokenProvider. + /// + /// + public TokenProvider(IEnumerable tokens) + { + _tokens = tokens.ToArray(); + + if (_tokens.Length == 0) + throw new ArgumentException("You did not provide any tokens."); + } + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs new file mode 100644 index 000000000000..12cbd54617e5 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs @@ -0,0 +1,59 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Extensions +{ + /// + /// Extension methods for IHostBuilder + /// + public static class IHostBuilderExtensions + { + /// + /// Add the api to your host builder. + /// + /// + public static IHostBuilder ConfigureApi(this IHostBuilder builder) + { + builder.ConfigureServices((context, services) => + { + HostConfiguration config = new HostConfiguration(services); + + IServiceCollectionExtensions.AddApi(services, config); + }); + + return builder; + } + + /// + /// Add the api to your host builder. + /// + /// + /// + public static IHostBuilder ConfigureApi(this IHostBuilder builder, Action options) + { + builder.ConfigureServices((context, services) => + { + HostConfiguration config = new HostConfiguration(services); + + options(context, services, config); + + IServiceCollectionExtensions.AddApi(services, config); + }); + + return builder; + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs new file mode 100644 index 000000000000..44d5cb75bdbb --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs @@ -0,0 +1,79 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Net.Http; +using Microsoft.Extensions.DependencyInjection; +using Polly.Timeout; +using Polly.Extensions.Http; +using Polly; + +namespace Org.OpenAPITools.Extensions +{ + /// + /// Extension methods for IHttpClientBuilder + /// + public static class IHttpClientBuilderExtensions + { + /// + /// Adds a Polly retry policy to your clients. + /// + /// + /// + /// + public static IHttpClientBuilder AddRetryPolicy(this IHttpClientBuilder client, int retries) + { + client.AddPolicyHandler(RetryPolicy(retries)); + + return client; + } + + /// + /// Adds a Polly timeout policy to your clients. + /// + /// + /// + /// + public static IHttpClientBuilder AddTimeoutPolicy(this IHttpClientBuilder client, TimeSpan timeout) + { + client.AddPolicyHandler(TimeoutPolicy(timeout)); + + return client; + } + + /// + /// Adds a Polly circuit breaker to your clients. + /// + /// + /// + /// + /// + public static IHttpClientBuilder AddCircuitBreakerPolicy(this IHttpClientBuilder client, int handledEventsAllowedBeforeBreaking, TimeSpan durationOfBreak) + { + client.AddTransientHttpErrorPolicy(builder => CircuitBreakerPolicy(builder, handledEventsAllowedBeforeBreaking, durationOfBreak)); + + return client; + } + + private static Polly.Retry.AsyncRetryPolicy RetryPolicy(int retries) + => HttpPolicyExtensions + .HandleTransientHttpError() + .Or() + .RetryAsync(retries); + + private static AsyncTimeoutPolicy TimeoutPolicy(TimeSpan timeout) + => Policy.TimeoutAsync(timeout); + + private static Polly.CircuitBreaker.AsyncCircuitBreakerPolicy CircuitBreakerPolicy( + PolicyBuilder builder, int handledEventsAllowedBeforeBreaking, TimeSpan durationOfBreak) + => builder.CircuitBreakerAsync(handledEventsAllowedBeforeBreaking, durationOfBreak); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs new file mode 100644 index 000000000000..028d95ae88e8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -0,0 +1,73 @@ +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Linq; +using Microsoft.Extensions.DependencyInjection; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Extensions +{ + /// + /// Extension methods for IServiceCollection + /// + public static class IServiceCollectionExtensions + { + /// + /// Add the api to your host builder. + /// + /// + public static void AddApi(this IServiceCollection services) + { + HostConfiguration config = new(services); + AddApi(services, config); + } + + /// + /// Add the api to your host builder. + /// + /// + /// + public static void AddApi(this IServiceCollection services, Action options) + { + HostConfiguration config = new(services); + options(config); + AddApi(services, config); + } + + internal static void AddApi(IServiceCollection services, HostConfiguration host) + { + if (!host.HttpClientsAdded) + host.AddApiHttpClients(); + + services.AddSingleton(); + + // ensure that a token provider was provided for this token type + // if not, default to RateLimitProvider + var containerServices = services.Where(s => s.ServiceType.IsGenericType && + s.ServiceType.GetGenericTypeDefinition().IsAssignableFrom(typeof(TokenContainer<>))).ToArray(); + + foreach(var containerService in containerServices) + { + var tokenType = containerService.ServiceType.GenericTypeArguments[0]; + + var provider = services.FirstOrDefault(s => s.ServiceType.IsAssignableFrom(typeof(TokenProvider<>).MakeGenericType(tokenType))); + + if (provider == null) + { + services.AddSingleton(typeof(RateLimitProvider<>).MakeGenericType(tokenType)); + services.AddSingleton(typeof(TokenProvider<>).MakeGenericType(tokenType), + s => s.GetRequiredService(typeof(RateLimitProvider<>).MakeGenericType(tokenType))); + } + } + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs new file mode 100644 index 000000000000..8d0604afacd4 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs @@ -0,0 +1,189 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// AreaCode + /// + public partial class AreaCode : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(StateTerritoryCode stateTerritoryCode) + { + StateTerritoryCode = stateTerritoryCode; + OnCreated(); + } + + /// + /// Initializes a new instance of the class. + /// + /// + internal AreaCode(MarineAreaCode marineAreaCode) + { + MarineAreaCode = marineAreaCode; + OnCreated(); + } + + partial void OnCreated(); + + /// + /// Gets or Sets StateTerritoryCode + /// + public StateTerritoryCode? StateTerritoryCode { get; set; } + + /// + /// Gets or Sets MarineAreaCode + /// + public MarineAreaCode? MarineAreaCode { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AreaCode {\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type + /// + public class AreaCodeJsonConverter : JsonConverter + { + /// + /// Deserializes json to + /// + /// + /// + /// + /// + /// + public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + StateTerritoryCode? stateTerritoryCode = default; + MarineAreaCode? marineAreaCode = default; + + Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader; + while (utf8JsonReaderOneOf.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReaderOneOf.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReaderOneOf.CurrentDepth) + break; + + if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) + { + Utf8JsonReader utf8JsonReaderStateTerritoryCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode); + + Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader; + ClientUtils.TryDeserialize(ref utf8JsonReaderMarineAreaCode, jsonSerializerOptions, out marineAreaCode); + } + } + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? localVarJsonPropertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (localVarJsonPropertyName) + { + default: + break; + } + } + } + + if (stateTerritoryCode != null) + return new AreaCode(stateTerritoryCode.Value); + + if (marineAreaCode != null) + return new AreaCode(marineAreaCode.Value); + + throw new JsonException(); + } + + /// + /// Serializes a + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + WriteProperties(writer, areaCode, jsonSerializerOptions); + writer.WriteEndObject(); + } + + /// + /// Serializes the properties of + /// + /// + /// + /// + /// + public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions) + { + + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs new file mode 100644 index 000000000000..57a76d49d32a --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -0,0 +1,175 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines MarineAreaCode + /// + public enum MarineAreaCode + { + /// + /// Enum AM for value: AM + /// + AM = 1, + + /// + /// Enum AN for value: AN + /// + AN = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class MarineAreaCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode FromString(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + throw new NotImplementedException($"Could not convert value to type MarineAreaCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static MarineAreaCode? FromStringOrDefault(string value) + { + if (value.Equals("AM")) + return MarineAreaCode.AM; + + if (value.Equals("AN")) + return MarineAreaCode.AN; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(MarineAreaCode value) + { + if (value == MarineAreaCode.AM) + return "AM"; + + if (value == MarineAreaCode.AN) + return "AN"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class MarineAreaCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the MarineAreaCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class MarineAreaCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a MarineAreaCode from the Json object + /// + /// + /// + /// + /// + public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + MarineAreaCode? result = rawValue == null + ? null + : MarineAreaCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) + { + writer.WriteStringValue(marineAreaCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs new file mode 100644 index 000000000000..3889d46b1211 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -0,0 +1,175 @@ +// +/* + * OpenAPI + * + * OpenAPI + * + * The version of the OpenAPI document: 0.0.1 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using Org.OpenAPITools.Client; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines StateTerritoryCode + /// + public enum StateTerritoryCode + { + /// + /// Enum AL for value: AL + /// + AL = 1, + + /// + /// Enum AK for value: AK + /// + AK = 2 + } + + /// + /// Converts to and from the JSON value + /// + public static class StateTerritoryCodeValueConverter + { + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode FromString(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + throw new NotImplementedException($"Could not convert value to type StateTerritoryCode: '{value}'"); + } + + /// + /// Parses a given value to + /// + /// + /// + public static StateTerritoryCode? FromStringOrDefault(string value) + { + if (value.Equals("AL")) + return StateTerritoryCode.AL; + + if (value.Equals("AK")) + return StateTerritoryCode.AK; + + return null; + } + + /// + /// Converts the to the json value + /// + /// + /// + /// + public static string ToJsonValue(StateTerritoryCode value) + { + if (value == StateTerritoryCode.AL) + return "AL"; + + if (value == StateTerritoryCode.AK) + return "AK"; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); + } + } + + /// + /// A Json converter for type + /// + /// + public class StateTerritoryCodeJsonConverter : JsonConverter + { + /// + /// Returns a from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the StateTerritoryCode to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode.ToString()); + } + } + + /// + /// A Json converter for type + /// + public class StateTerritoryCodeNullableJsonConverter : JsonConverter + { + /// + /// Returns a StateTerritoryCode from the Json object + /// + /// + /// + /// + /// + public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + string? rawValue = reader.GetString(); + + StateTerritoryCode? result = rawValue == null + ? null + : StateTerritoryCodeValueConverter.FromStringOrDefault(rawValue); + + if (result != null) + return result.Value; + + throw new JsonException(); + } + + /// + /// Writes the DateTime to the json writer + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) + { + writer.WriteStringValue(stateTerritoryCode?.ToString() ?? "null"); + } + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Org.OpenAPITools.csproj new file mode 100644 index 000000000000..7653c5c71536 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -0,0 +1,31 @@ + + + + true + net9.0 + Org.OpenAPITools + Org.OpenAPITools + Library + OpenAPI + OpenAPI + OpenAPI Library + A library generated from a OpenAPI doc + No Copyright + Org.OpenAPITools + 1.0.0 + bin\$(Configuration)\$(TargetFramework)\Org.OpenAPITools.xml + https://github.com/GIT_USER_ID/GIT_REPO_ID.git + git + Minor update + enable + false + + + + + + + + + + diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/README.md new file mode 100644 index 000000000000..122df19db033 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/README.md @@ -0,0 +1,108 @@ +# Created with Openapi Generator + + +## Creating the library +Create a config.yaml file similar to what is below, then run the following powershell command to generate the library `java -jar "/openapi-generator/modules/openapi-generator-cli/target/openapi-generator-cli.jar" generate -c config.yaml` + +```yaml +generatorName: csharp +inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml +outputDir: out + +# https://openapi-generator.tech/docs/generators/csharp +additionalProperties: + packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' + +# https://openapi-generator.tech/docs/integrations/#github-integration +# gitHost: +# gitUserId: +# gitRepoId: + +# https://openapi-generator.tech/docs/globals +# globalProperties: + +# https://openapi-generator.tech/docs/customization/#inline-schema-naming +# inlineSchemaOptions: + +# https://openapi-generator.tech/docs/customization/#name-mapping +# modelNameMappings: +# nameMappings: + +# https://openapi-generator.tech/docs/customization/#openapi-normalizer +# openapiNormalizer: + +# templateDir: https://openapi-generator.tech/docs/templating/#modifying-templates + +# releaseNote: +``` + + +## Using the library in your project + +```cs +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Extensions; + +namespace YourProject +{ + public class Program + { + public static async Task Main(string[] args) + { + var host = CreateHostBuilder(args).Build(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .ConfigureApi((context, services, options) => + { + options.ConfigureJsonOptions((jsonOptions) => + { + // your custom converters if any + }); + + options.AddApiHttpClients(client => + { + // client configuration + }, builder => + { + builder + .AddRetryPolicy(2) + .AddTimeoutPolicy(TimeSpan.FromSeconds(5)) + .AddCircuitBreakerPolicy(10, TimeSpan.FromSeconds(30)); + // add whatever middleware you prefer + } + ); + }); + } +} +``` + +## Questions + +- What about HttpRequest failures and retries? + Configure Polly in the IHttpClientBuilder +- How are tokens used? + Tokens are provided by a TokenProvider class. The default is RateLimitProvider which will perform client side rate limiting. + Other providers can be used with the UseProvider method. +- Does an HttpRequest throw an error when the server response is not Ok? + It depends how you made the request. If the return type is ApiResponse no error will be thrown, though the Content property will be null. + StatusCode and ReasonPhrase will contain information about the error. + If the return type is T, then it will throw. If the return type is TOrDefault, it will return null. +- How do I validate requests and process responses? + Use the provided On and After partial methods in the api classes. + +## Api Information +- appName: OpenAPI +- appVersion: 0.0.1 +- appDescription: OpenAPI + +## Build +This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project. + +- SDK version: 1.0.0 +- Generator version: 7.15.0-SNAPSHOT +- Build package: org.openapitools.codegen.languages.CSharpClientCodegen From 1d2fe5ee875802cd008cab608a282b6509adff69 Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 3 Aug 2025 16:05:30 -0400 Subject: [PATCH 4/5] added to appveyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 8c69faaa4492..7224af436fe7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,6 +43,7 @@ build_script: #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln test_script: + - dotnet test samples\client\petstore\csharp\generichost\latest\ComposedEnum\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj - dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj - dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj - dotnet test samples\client\petstore\csharp\generichost\latest\OneOfList\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj From be4fe98f43b276618277165f99a651a2da7a92ce Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 3 Aug 2025 17:52:43 -0400 Subject: [PATCH 5/5] build samples again --- .../generichost/latest/ComposedEnum/.openapi-generator/FILES | 5 ----- 1 file changed, 5 deletions(-) diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES index b40fe17be173..a0b893ad3a65 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES @@ -1,5 +1,4 @@ .gitignore -.openapi-generator-ignore Org.OpenAPITools.sln README.md api/openapi.yaml @@ -9,11 +8,7 @@ docs/models/MarineAreaCode.md docs/models/StateTerritoryCode.md docs/scripts/git_push.ps1 docs/scripts/git_push.sh -src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs -src/Org.OpenAPITools.Test/Model/AreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/MarineAreaCodeTests.cs -src/Org.OpenAPITools.Test/Model/StateTerritoryCodeTests.cs src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj src/Org.OpenAPITools.Test/README.md src/Org.OpenAPITools/Api/IApi.cs