add asJsonObject method to OAIEnum class to fix enum handling in query parameters

Author: ReallyVirtual

modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache

@@ -2,6 +2,7 @@
 #ifndef {{prefix}}_ENUM_H
 #define {{prefix}}_ENUM_H
 
+#include <QJsonObject>
 #include <QJsonValue>
 #include <QMetaType>
 #include <QString>
@@ -28,6 +29,12 @@ public:
         return jstr;
     }
 
+    virtual QJsonObject asJsonObject() const {
+        QJsonObject obj;
+        obj["value"] = jstr;
+        return obj;
+    }
+	
     virtual void fromJson(QString jsonString) {
         jstr = jsonString;
     }

samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h

@@ -12,6 +12,7 @@
 #ifndef PFX_ENUM_H
 #define PFX_ENUM_H
 
+#include <QJsonObject>
 #include <QJsonValue>
 #include <QMetaType>
 #include <QString>
@@ -36,6 +37,12 @@ class PFXEnum {
         return jstr;
     }
 
+    virtual QJsonObject asJsonObject() const {
+        QJsonObject obj;
+        obj["value"] = jstr;
+        return obj;
+    }
+	
     virtual void fromJson(QString jsonString) {
         jstr = jsonString;
     }

samples/client/petstore/cpp-qt/client/PFXEnum.h

@@ -12,6 +12,7 @@
 #ifndef PFX_ENUM_H
 #define PFX_ENUM_H
 
+#include <QJsonObject>
 #include <QJsonValue>
 #include <QMetaType>
 #include <QString>
@@ -36,6 +37,12 @@ class PFXEnum {
         return jstr;
     }
 
+    virtual QJsonObject asJsonObject() const {
+        QJsonObject obj;
+        obj["value"] = jstr;
+        return obj;
+    }
+	
     virtual void fromJson(QString jsonString) {
         jstr = jsonString;
     }

samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Model/OneOfArrayRequest.cs

@@ -43,10 +43,10 @@ internal OneOfArrayRequest(List<string> list)
         /// <summary>
         /// Initializes a new instance of the <see cref="OneOfArrayRequest" /> class.
         /// </summary>
-        /// <param name="list1"></param>
-        internal OneOfArrayRequest(List<TestObject> list1)
+        /// <param name="list"></param>
+        internal OneOfArrayRequest(List<TestObject> list)
         {
-            List1 = list1;
+            List = list;
             OnCreated();
         }
 
@@ -58,9 +58,9 @@ internal OneOfArrayRequest(List<TestObject> list1)
         public List<string>? List { get; set; }
 
         /// <summary>
-        /// Gets or Sets List1
+        /// Gets or Sets List
         /// </summary>
-        public List<TestObject>? List1 { get; set; }
+        public List<TestObject>? List { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -108,7 +108,7 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
             List<string>? list = default;
-            List<TestObject>? list1 = default;
+            List<TestObject>? list = default;
 
             Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader;
             while (utf8JsonReaderOneOf.Read())
@@ -124,8 +124,8 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
                     Utf8JsonReader utf8JsonReaderList = utf8JsonReader;
                     ClientUtils.TryDeserialize<List<string>?>(ref utf8JsonReaderList, jsonSerializerOptions, out list);
 
-                    Utf8JsonReader utf8JsonReaderList1 = utf8JsonReader;
-                    ClientUtils.TryDeserialize<List<TestObject>?>(ref utf8JsonReaderList1, jsonSerializerOptions, out list1);
+                    Utf8JsonReader utf8JsonReaderList = utf8JsonReader;
+                    ClientUtils.TryDeserialize<List<TestObject>?>(ref utf8JsonReaderList, jsonSerializerOptions, out list);
                 }
             }
 
@@ -153,8 +153,8 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
             if (list != null)
                 return new OneOfArrayRequest(list);
 
-            if (list1 != null)
-                return new OneOfArrayRequest(list1);
+            if (list != null)
+                return new OneOfArrayRequest(list);
 
             throw new JsonException();
         }

samples/client/petstore/elixir/mix.exs

@@ -35,9 +35,9 @@ defmodule OpenapiPetstore.Mixfile do
   # Type "mix help deps" for more examples and options
   defp deps do
     [
-      {:tesla, "~> 1.14"},
-      {:ex_doc, "~> 0.37.3", only: :dev, runtime: false},
-      {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}
+      {:tesla, "~> 1.7"},
+      {:ex_doc, "~> 0.30", only: :dev, runtime: false},
+      {:dialyxir, "~> 1.3", only: [:dev, :test], runtime: false}
     ]
   end
 

samples/client/petstore/rust/hyper/petstore/.openapi-generator/FILES

@@ -8,6 +8,7 @@ docs/ApiResponse.md
 docs/ArrayItemRefTest.md
 docs/Baz.md
 docs/Category.md
+docs/DuplicateOneOf.md
 docs/DuplicateTest.md
 docs/Duplicatetest.md
 docs/EnumArrayTesting.md
@@ -33,6 +34,7 @@ docs/User.md
 docs/UserApi.md
 docs/Vehicle.md
 docs/WithInnerOneOf.md
+docs/WithInnerOneOfFoo.md
 git_push.sh
 src/apis/client.rs
 src/apis/configuration.rs
@@ -51,6 +53,7 @@ src/models/api_response.rs
 src/models/array_item_ref_test.rs
 src/models/baz.rs
 src/models/category.rs
+src/models/duplicate_one_of.rs
 src/models/duplicate_test.rs
 src/models/duplicatetest.rs
 src/models/enum_array_testing.rs
@@ -71,3 +74,4 @@ src/models/unique_item_array_testing.rs
 src/models/user.rs
 src/models/vehicle.rs
 src/models/with_inner_one_of.rs
+src/models/with_inner_one_of_foo.rs

samples/client/petstore/rust/hyper/petstore/README.md

@@ -61,6 +61,7 @@ Class | Method | HTTP request | Description
  - [ArrayItemRefTest](docs/ArrayItemRefTest.md)
  - [Baz](docs/Baz.md)
  - [Category](docs/Category.md)
+ - [DuplicateOneOf](docs/DuplicateOneOf.md)
  - [DuplicateTest](docs/DuplicateTest.md)
  - [Duplicatetest](docs/Duplicatetest.md)
  - [EnumArrayTesting](docs/EnumArrayTesting.md)
@@ -81,6 +82,7 @@ Class | Method | HTTP request | Description
  - [User](docs/User.md)
  - [Vehicle](docs/Vehicle.md)
  - [WithInnerOneOf](docs/WithInnerOneOf.md)
+ - [WithInnerOneOfFoo](docs/WithInnerOneOfFoo.md)
 
 
 To get access to the crate's generated documentation, use:

samples/client/petstore/rust/hyper/petstore/docs/WithInnerOneOf.md

@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**foo** | Option<[**models::Order**](Order.md)> |  | [optional]
+**foo** | Option<[**models::WithInnerOneOfFoo**](WithInnerOneOf_foo.md)> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/rust/hyper/petstore/src/models/duplicate_one_of.rs

@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
 #[serde(untagged)]
 pub enum DuplicateOneOf {
     Order(Box<models::Order>),
+    Order(Box<models::Order>),
 }
 
 impl Default for DuplicateOneOf {

samples/client/petstore/rust/hyper/petstore/src/models/mod.rs

@@ -10,6 +10,8 @@ pub mod baz;
 pub use self::baz::Baz;
 pub mod category;
 pub use self::category::Category;
+pub mod duplicate_one_of;
+pub use self::duplicate_one_of::DuplicateOneOf;
 pub mod duplicate_test;
 pub use self::duplicate_test::DuplicateTest;
 pub mod duplicatetest;
@@ -50,6 +52,8 @@ pub mod vehicle;
 pub use self::vehicle::Vehicle;
 pub mod with_inner_one_of;
 pub use self::with_inner_one_of::WithInnerOneOf;
+pub mod with_inner_one_of_foo;
+pub use self::with_inner_one_of_foo::WithInnerOneOfFoo;
 use serde::{Deserialize, Deserializer, Serializer};
 use serde_with::{de::DeserializeAsWrap, ser::SerializeAsWrap, DeserializeAs, SerializeAs};
 use std::marker::PhantomData;