update samples to fix python tests

Author: wing328

bin/configs/python-pydantic-v1.yaml

@@ -13,3 +13,5 @@ additionalProperties:
 nameMappings:
   _type: underscore_type
   type_: type_with_underscore
+openapiNormalizer:
+  SIMPLIFY_ONEOF_ANYOF_ENUM: false

bin/configs/python.yaml

@@ -13,3 +13,5 @@ nameMappings:
 modelNameMappings:
   # The OpenAPI spec ApiResponse conflicts with the internal ApiResponse
   ApiResponse: ModelApiResponse
+openapiNormalizer:
+  SIMPLIFY_ONEOF_ANYOF_ENUM: false

samples/client/petstore/csharp/generichost/latest/ComposedEnum/api/openapi.yaml

@@ -8,9 +8,12 @@ servers:
 components:
   schemas:
     AreaCode:
-      oneOf:
-      - $ref: "#/components/schemas/StateTerritoryCode"
-      - $ref: "#/components/schemas/MarineAreaCode"
+      enum:
+      - AL
+      - AK
+      - AM
+      - AN
+      type: string
     StateTerritoryCode:
       enum:
       - AL

samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs

@@ -111,6 +111,8 @@ public static bool TryDeserialize<T>(ref Utf8JsonReader reader, JsonSerializerOp
                 return boolean
                     ? "true"
                     : "false";
+            if (obj is AreaCode areaCode)
+                return AreaCodeValueConverter.ToJsonValue(areaCode);
             if (obj is MarineAreaCode marineAreaCode)
                 return MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode);
             if (obj is StateTerritoryCode stateTerritoryCode)

samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs

@@ -44,6 +44,7 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
             _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new AreaCodeJsonConverter());
+            _jsonOptions.Converters.Add(new AreaCodeNullableJsonConverter());
             _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter());
             _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter());
             _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter());

samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs

@@ -26,164 +26,178 @@
 namespace Org.OpenAPITools.Model
 {
     /// <summary>
-    /// AreaCode
+    /// Defines AreaCode
     /// </summary>
-    public partial class AreaCode : IValidatableObject
+    public enum AreaCode
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="AreaCode" /> class.
+        /// Enum AL for value: AL
         /// </summary>
-        /// <param name="stateTerritoryCode"></param>
-        internal AreaCode(StateTerritoryCode stateTerritoryCode)
-        {
-            StateTerritoryCode = stateTerritoryCode;
-            OnCreated();
-        }
+        AL = 1,
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AreaCode" /> class.
+        /// Enum AK for value: AK
         /// </summary>
-        /// <param name="marineAreaCode"></param>
-        internal AreaCode(MarineAreaCode marineAreaCode)
-        {
-            MarineAreaCode = marineAreaCode;
-            OnCreated();
-        }
+        AK = 2,
 
-        partial void OnCreated();
+        /// <summary>
+        /// Enum AM for value: AM
+        /// </summary>
+        AM = 3,
 
         /// <summary>
-        /// Gets or Sets StateTerritoryCode
+        /// Enum AN for value: AN
         /// </summary>
-        public StateTerritoryCode? StateTerritoryCode { get; set; }
+        AN = 4
+    }
 
+    /// <summary>
+    /// Converts <see cref="AreaCode"/> to and from the JSON value
+    /// </summary>
+    public static class AreaCodeValueConverter
+    {
         /// <summary>
-        /// Gets or Sets MarineAreaCode
+        /// Parses a given value to <see cref="AreaCode"/>
         /// </summary>
-        public MarineAreaCode? MarineAreaCode { get; set; }
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static AreaCode FromString(string value)
+        {
+            if (value.Equals("AL"))
+                return AreaCode.AL;
+
+            if (value.Equals("AK"))
+                return AreaCode.AK;
+
+            if (value.Equals("AM"))
+                return AreaCode.AM;
+
+            if (value.Equals("AN"))
+                return AreaCode.AN;
+
+            throw new NotImplementedException($"Could not convert value to type AreaCode: '{value}'");
+        }
 
         /// <summary>
-        /// Returns the string presentation of the object
+        /// Parses a given value to <see cref="AreaCode"/>
         /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static AreaCode? FromStringOrDefault(string value)
         {
-            StringBuilder sb = new StringBuilder();
-            sb.Append("class AreaCode {\n");
-            sb.Append("}\n");
-            return sb.ToString();
+            if (value.Equals("AL"))
+                return AreaCode.AL;
+
+            if (value.Equals("AK"))
+                return AreaCode.AK;
+
+            if (value.Equals("AM"))
+                return AreaCode.AM;
+
+            if (value.Equals("AN"))
+                return AreaCode.AN;
+
+            return null;
         }
 
         /// <summary>
-        /// To validate all properties of the instance
+        /// Converts the <see cref="AreaCode"/> to the json value
         /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(AreaCode value)
         {
-            yield break;
+            if (value == AreaCode.AL)
+                return "AL";
+
+            if (value == AreaCode.AK)
+                return "AK";
+
+            if (value == AreaCode.AM)
+                return "AM";
+
+            if (value == AreaCode.AN)
+                return "AN";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="AreaCode" />
+    /// A Json converter for type <see cref="AreaCode"/>
     /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
     public class AreaCodeJsonConverter : JsonConverter<AreaCode>
     {
         /// <summary>
-        /// Deserializes json to <see cref="AreaCode" />
+        /// Returns a  from the Json object
         /// </summary>
-        /// <param name="utf8JsonReader"></param>
+        /// <param name="reader"></param>
         /// <param name="typeToConvert"></param>
-        /// <param name="jsonSerializerOptions"></param>
+        /// <param name="options"></param>
         /// <returns></returns>
-        /// <exception cref="JsonException"></exception>
-        public override AreaCode Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions)
+        public override AreaCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            int currentDepth = utf8JsonReader.CurrentDepth;
+            string? rawValue = reader.GetString();
 
-            if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray)
-                throw new JsonException();
+            AreaCode? result = rawValue == null
+                ? null
+                : AreaCodeValueConverter.FromStringOrDefault(rawValue);
 
-            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<StateTerritoryCode?>(ref utf8JsonReaderStateTerritoryCode, jsonSerializerOptions, out stateTerritoryCode);
-
-                    Utf8JsonReader utf8JsonReaderMarineAreaCode = utf8JsonReader;
-                    ClientUtils.TryDeserialize<MarineAreaCode?>(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);
+            if (result != null)
+                return result.Value;
 
             throw new JsonException();
         }
 
         /// <summary>
-        /// Serializes a <see cref="AreaCode" />
+        /// Writes the AreaCode to the json writer
         /// </summary>
         /// <param name="writer"></param>
         /// <param name="areaCode"></param>
-        /// <param name="jsonSerializerOptions"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions)
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(AreaCodeValueConverter.ToJsonValue(areaCode).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="AreaCode"/>
+    /// </summary>
+    public class AreaCodeNullableJsonConverter : JsonConverter<AreaCode?>
+    {
+        /// <summary>
+        /// Returns a AreaCode from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override AreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            writer.WriteStartObject();
+            string? rawValue = reader.GetString();
+
+            AreaCode? result = rawValue == null
+                ? null
+                : AreaCodeValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
 
-            WriteProperties(writer, areaCode, jsonSerializerOptions);
-            writer.WriteEndObject();
+            throw new JsonException();
         }
 
         /// <summary>
-        /// Serializes the properties of <see cref="AreaCode" />
+        /// Writes the AreaCode to the json writer
         /// </summary>
         /// <param name="writer"></param>
         /// <param name="areaCode"></param>
-        /// <param name="jsonSerializerOptions"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        public void WriteProperties(Utf8JsonWriter writer, AreaCode areaCode, JsonSerializerOptions jsonSerializerOptions)
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, AreaCode? areaCode, JsonSerializerOptions options)
         {
-
+            writer.WriteStringValue(areaCode.HasValue ? AreaCodeValueConverter.ToJsonValue(areaCode.Value).ToString() : "null");
         }
     }
 }

samples/openapi3/client/petstore/python-pydantic-v1/docs/OneOfEnumString.md

@@ -2,16 +2,27 @@
 
 oneOf enum strings
 
-## Enum
-
-* `A` (value: `'a'`)
-
-* `B` (value: `'b'`)
-
-* `C` (value: `'c'`)
-
-* `D` (value: `'d'`)
-
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+## Example
+
+```python
+from petstore_api.models.one_of_enum_string import OneOfEnumString
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of OneOfEnumString from a JSON string
+one_of_enum_string_instance = OneOfEnumString.from_json(json)
+# print the JSON string representation of the object
+print OneOfEnumString.to_json()
+
+# convert the object into a dict
+one_of_enum_string_dict = one_of_enum_string_instance.to_dict()
+# create an instance of OneOfEnumString from a dict
+one_of_enum_string_from_dict = OneOfEnumString.from_dict(one_of_enum_string_dict)
+```
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)