Skip to content

Commit 543675d

Browse files
ReallyVirtualReallyVirtual
committed
add asJsonObject method to OAIEnum class to fix enum handling in query parameters
1 parent f281371 commit 543675d

File tree

76 files changed

+177
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+177
-36
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef {{prefix}}_ENUM_H
33
#define {{prefix}}_ENUM_H
44

5+
#include <QJsonObject>
56
#include <QJsonValue>
67
#include <QMetaType>
78
#include <QString>
@@ -28,6 +29,12 @@ public:
2829
return jstr;
2930
}
3031

32+
virtual QJsonObject asJsonObject() const {
33+
QJsonObject obj;
34+
obj["value"] = jstr;
35+
return obj;
36+
}
37+
3138
virtual void fromJson(QString jsonString) {
3239
jstr = jsonString;
3340
}

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

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifndef PFX_ENUM_H
1313
#define PFX_ENUM_H
1414

15+
#include <QJsonObject>
1516
#include <QJsonValue>
1617
#include <QMetaType>
1718
#include <QString>
@@ -36,6 +37,12 @@ class PFXEnum {
3637
return jstr;
3738
}
3839

40+
virtual QJsonObject asJsonObject() const {
41+
QJsonObject obj;
42+
obj["value"] = jstr;
43+
return obj;
44+
}
45+
3946
virtual void fromJson(QString jsonString) {
4047
jstr = jsonString;
4148
}

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

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifndef PFX_ENUM_H
1313
#define PFX_ENUM_H
1414

15+
#include <QJsonObject>
1516
#include <QJsonValue>
1617
#include <QMetaType>
1718
#include <QString>
@@ -36,6 +37,12 @@ class PFXEnum {
3637
return jstr;
3738
}
3839

40+
virtual QJsonObject asJsonObject() const {
41+
QJsonObject obj;
42+
obj["value"] = jstr;
43+
return obj;
44+
}
45+
3946
virtual void fromJson(QString jsonString) {
4047
jstr = jsonString;
4148
}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ internal OneOfArrayRequest(List<string> list)
4343
/// <summary>
4444
/// Initializes a new instance of the <see cref="OneOfArrayRequest" /> class.
4545
/// </summary>
46-
/// <param name="list1"></param>
47-
internal OneOfArrayRequest(List<TestObject> list1)
46+
/// <param name="list"></param>
47+
internal OneOfArrayRequest(List<TestObject> list)
4848
{
49-
List1 = list1;
49+
List = list;
5050
OnCreated();
5151
}
5252

@@ -58,9 +58,9 @@ internal OneOfArrayRequest(List<TestObject> list1)
5858
public List<string>? List { get; set; }
5959

6060
/// <summary>
61-
/// Gets or Sets List1
61+
/// Gets or Sets List
6262
/// </summary>
63-
public List<TestObject>? List1 { get; set; }
63+
public List<TestObject>? List { get; set; }
6464

6565
/// <summary>
6666
/// Returns the string presentation of the object
@@ -108,7 +108,7 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
108108
JsonTokenType startingTokenType = utf8JsonReader.TokenType;
109109

110110
List<string>? list = default;
111-
List<TestObject>? list1 = default;
111+
List<TestObject>? list = default;
112112

113113
Utf8JsonReader utf8JsonReaderOneOf = utf8JsonReader;
114114
while (utf8JsonReaderOneOf.Read())
@@ -124,8 +124,8 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
124124
Utf8JsonReader utf8JsonReaderList = utf8JsonReader;
125125
ClientUtils.TryDeserialize<List<string>?>(ref utf8JsonReaderList, jsonSerializerOptions, out list);
126126

127-
Utf8JsonReader utf8JsonReaderList1 = utf8JsonReader;
128-
ClientUtils.TryDeserialize<List<TestObject>?>(ref utf8JsonReaderList1, jsonSerializerOptions, out list1);
127+
Utf8JsonReader utf8JsonReaderList = utf8JsonReader;
128+
ClientUtils.TryDeserialize<List<TestObject>?>(ref utf8JsonReaderList, jsonSerializerOptions, out list);
129129
}
130130
}
131131

@@ -153,8 +153,8 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
153153
if (list != null)
154154
return new OneOfArrayRequest(list);
155155

156-
if (list1 != null)
157-
return new OneOfArrayRequest(list1);
156+
if (list != null)
157+
return new OneOfArrayRequest(list);
158158

159159
throw new JsonException();
160160
}

‎samples/client/petstore/elixir/mix.exs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ defmodule OpenapiPetstore.Mixfile do
3535
# Type "mix help deps" for more examples and options
3636
defp deps do
3737
[
38-
{:tesla, "~> 1.14"},
39-
{:ex_doc, "~> 0.37.3", only: :dev, runtime: false},
40-
{:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}
38+
{:tesla, "~> 1.7"},
39+
{:ex_doc, "~> 0.30", only: :dev, runtime: false},
40+
{:dialyxir, "~> 1.3", only: [:dev, :test], runtime: false}
4141
]
4242
end
4343

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

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docs/ApiResponse.md
88
docs/ArrayItemRefTest.md
99
docs/Baz.md
1010
docs/Category.md
11+
docs/DuplicateOneOf.md
1112
docs/DuplicateTest.md
1213
docs/Duplicatetest.md
1314
docs/EnumArrayTesting.md
@@ -33,6 +34,7 @@ docs/User.md
3334
docs/UserApi.md
3435
docs/Vehicle.md
3536
docs/WithInnerOneOf.md
37+
docs/WithInnerOneOfFoo.md
3638
git_push.sh
3739
src/apis/client.rs
3840
src/apis/configuration.rs
@@ -51,6 +53,7 @@ src/models/api_response.rs
5153
src/models/array_item_ref_test.rs
5254
src/models/baz.rs
5355
src/models/category.rs
56+
src/models/duplicate_one_of.rs
5457
src/models/duplicate_test.rs
5558
src/models/duplicatetest.rs
5659
src/models/enum_array_testing.rs
@@ -71,3 +74,4 @@ src/models/unique_item_array_testing.rs
7174
src/models/user.rs
7275
src/models/vehicle.rs
7376
src/models/with_inner_one_of.rs
77+
src/models/with_inner_one_of_foo.rs

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

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Class | Method | HTTP request | Description
6161
- [ArrayItemRefTest](docs/ArrayItemRefTest.md)
6262
- [Baz](docs/Baz.md)
6363
- [Category](docs/Category.md)
64+
- [DuplicateOneOf](docs/DuplicateOneOf.md)
6465
- [DuplicateTest](docs/DuplicateTest.md)
6566
- [Duplicatetest](docs/Duplicatetest.md)
6667
- [EnumArrayTesting](docs/EnumArrayTesting.md)
@@ -81,6 +82,7 @@ Class | Method | HTTP request | Description
8182
- [User](docs/User.md)
8283
- [Vehicle](docs/Vehicle.md)
8384
- [WithInnerOneOf](docs/WithInnerOneOf.md)
85+
- [WithInnerOneOfFoo](docs/WithInnerOneOfFoo.md)
8486

8587

8688
To get access to the crate's generated documentation, use:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**foo** | Option<[**models::Order**](Order.md)> | | [optional]
7+
**foo** | Option<[**models::WithInnerOneOfFoo**](WithInnerOneOf_foo.md)> | | [optional]
88

99
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1010

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

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
1515
#[serde(untagged)]
1616
pub enum DuplicateOneOf {
1717
Order(Box<models::Order>),
18+
Order(Box<models::Order>),
1819
}
1920

2021
impl Default for DuplicateOneOf {

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

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pub mod baz;
1010
pub use self::baz::Baz;
1111
pub mod category;
1212
pub use self::category::Category;
13+
pub mod duplicate_one_of;
14+
pub use self::duplicate_one_of::DuplicateOneOf;
1315
pub mod duplicate_test;
1416
pub use self::duplicate_test::DuplicateTest;
1517
pub mod duplicatetest;
@@ -50,6 +52,8 @@ pub mod vehicle;
5052
pub use self::vehicle::Vehicle;
5153
pub mod with_inner_one_of;
5254
pub use self::with_inner_one_of::WithInnerOneOf;
55+
pub mod with_inner_one_of_foo;
56+
pub use self::with_inner_one_of_foo::WithInnerOneOfFoo;
5357
use serde::{Deserialize, Deserializer, Serializer};
5458
use serde_with::{de::DeserializeAsWrap, ser::SerializeAsWrap, DeserializeAs, SerializeAs};
5559
use std::marker::PhantomData;

‎samples/client/petstore/rust/hyper/petstore/src/models/with_inner_one_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
1414
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct WithInnerOneOf {
1616
#[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
17-
pub foo: Option<Box<models::Order>>,
17+
pub foo: Option<Box<models::WithInnerOneOfFoo>>,
1818
}
1919

2020
impl WithInnerOneOf {

‎samples/client/petstore/rust/hyper/petstore/src/models/with_inner_one_of_foo.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
1515
#[serde(untagged)]
1616
pub enum WithInnerOneOfFoo {
1717
Order(Box<models::Order>),
18+
Order(Box<models::Order>),
1819
}
1920

2021
impl Default for WithInnerOneOfFoo {

‎samples/client/petstore/rust/hyper0x/petstore/.openapi-generator/FILES

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docs/ApiResponse.md
88
docs/ArrayItemRefTest.md
99
docs/Baz.md
1010
docs/Category.md
11+
docs/DuplicateOneOf.md
1112
docs/DuplicateTest.md
1213
docs/Duplicatetest.md
1314
docs/EnumArrayTesting.md
@@ -33,6 +34,7 @@ docs/User.md
3334
docs/UserApi.md
3435
docs/Vehicle.md
3536
docs/WithInnerOneOf.md
37+
docs/WithInnerOneOfFoo.md
3638
git_push.sh
3739
src/apis/configuration.rs
3840
src/apis/fake_api.rs
@@ -49,6 +51,7 @@ src/models/api_response.rs
4951
src/models/array_item_ref_test.rs
5052
src/models/baz.rs
5153
src/models/category.rs
54+
src/models/duplicate_one_of.rs
5255
src/models/duplicate_test.rs
5356
src/models/duplicatetest.rs
5457
src/models/enum_array_testing.rs
@@ -69,3 +72,4 @@ src/models/unique_item_array_testing.rs
6972
src/models/user.rs
7073
src/models/vehicle.rs
7174
src/models/with_inner_one_of.rs
75+
src/models/with_inner_one_of_foo.rs

‎samples/client/petstore/rust/hyper0x/petstore/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Class | Method | HTTP request | Description
6161
- [ArrayItemRefTest](docs/ArrayItemRefTest.md)
6262
- [Baz](docs/Baz.md)
6363
- [Category](docs/Category.md)
64+
- [DuplicateOneOf](docs/DuplicateOneOf.md)
6465
- [DuplicateTest](docs/DuplicateTest.md)
6566
- [Duplicatetest](docs/Duplicatetest.md)
6667
- [EnumArrayTesting](docs/EnumArrayTesting.md)
@@ -81,6 +82,7 @@ Class | Method | HTTP request | Description
8182
- [User](docs/User.md)
8283
- [Vehicle](docs/Vehicle.md)
8384
- [WithInnerOneOf](docs/WithInnerOneOf.md)
85+
- [WithInnerOneOfFoo](docs/WithInnerOneOfFoo.md)
8486

8587

8688
To get access to the crate's generated documentation, use:

‎samples/client/petstore/rust/hyper0x/petstore/docs/WithInnerOneOf.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**foo** | Option<[**models::Order**](Order.md)> | | [optional]
7+
**foo** | Option<[**models::WithInnerOneOfFoo**](WithInnerOneOf_foo.md)> | | [optional]
88

99
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1010

‎samples/client/petstore/rust/hyper0x/petstore/src/models/duplicate_one_of.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
1515
#[serde(untagged)]
1616
pub enum DuplicateOneOf {
1717
Order(Box<models::Order>),
18+
Order(Box<models::Order>),
1819
}
1920

2021
impl Default for DuplicateOneOf {

‎samples/client/petstore/rust/hyper0x/petstore/src/models/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pub mod baz;
1010
pub use self::baz::Baz;
1111
pub mod category;
1212
pub use self::category::Category;
13+
pub mod duplicate_one_of;
14+
pub use self::duplicate_one_of::DuplicateOneOf;
1315
pub mod duplicate_test;
1416
pub use self::duplicate_test::DuplicateTest;
1517
pub mod duplicatetest;
@@ -50,6 +52,8 @@ pub mod vehicle;
5052
pub use self::vehicle::Vehicle;
5153
pub mod with_inner_one_of;
5254
pub use self::with_inner_one_of::WithInnerOneOf;
55+
pub mod with_inner_one_of_foo;
56+
pub use self::with_inner_one_of_foo::WithInnerOneOfFoo;
5357
use serde::{Deserialize, Deserializer, Serializer};
5458
use serde_with::{de::DeserializeAsWrap, ser::SerializeAsWrap, DeserializeAs, SerializeAs};
5559
use std::marker::PhantomData;

‎samples/client/petstore/rust/hyper0x/petstore/src/models/with_inner_one_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
1414
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct WithInnerOneOf {
1616
#[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
17-
pub foo: Option<Box<models::Order>>,
17+
pub foo: Option<Box<models::WithInnerOneOfFoo>>,
1818
}
1919

2020
impl WithInnerOneOf {

‎samples/client/petstore/rust/hyper0x/petstore/src/models/with_inner_one_of_foo.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
1515
#[serde(untagged)]
1616
pub enum WithInnerOneOfFoo {
1717
Order(Box<models::Order>),
18+
Order(Box<models::Order>),
1819
}
1920

2021
impl Default for WithInnerOneOfFoo {

‎samples/client/petstore/rust/reqwest-trait/petstore/.openapi-generator/FILES

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docs/ApiResponse.md
88
docs/ArrayItemRefTest.md
99
docs/Baz.md
1010
docs/Category.md
11+
docs/DuplicateOneOf.md
1112
docs/DuplicateTest.md
1213
docs/Duplicatetest.md
1314
docs/EnumArrayTesting.md
@@ -33,6 +34,7 @@ docs/User.md
3334
docs/UserApi.md
3435
docs/Vehicle.md
3536
docs/WithInnerOneOf.md
37+
docs/WithInnerOneOfFoo.md
3638
git_push.sh
3739
src/apis/configuration.rs
3840
src/apis/fake_api.rs
@@ -49,6 +51,7 @@ src/models/api_response.rs
4951
src/models/array_item_ref_test.rs
5052
src/models/baz.rs
5153
src/models/category.rs
54+
src/models/duplicate_one_of.rs
5255
src/models/duplicate_test.rs
5356
src/models/duplicatetest.rs
5457
src/models/enum_array_testing.rs
@@ -69,3 +72,4 @@ src/models/unique_item_array_testing.rs
6972
src/models/user.rs
7073
src/models/vehicle.rs
7174
src/models/with_inner_one_of.rs
75+
src/models/with_inner_one_of_foo.rs

‎samples/client/petstore/rust/reqwest-trait/petstore/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Class | Method | HTTP request | Description
6161
- [ArrayItemRefTest](docs/ArrayItemRefTest.md)
6262
- [Baz](docs/Baz.md)
6363
- [Category](docs/Category.md)
64+
- [DuplicateOneOf](docs/DuplicateOneOf.md)
6465
- [DuplicateTest](docs/DuplicateTest.md)
6566
- [Duplicatetest](docs/Duplicatetest.md)
6667
- [EnumArrayTesting](docs/EnumArrayTesting.md)
@@ -81,6 +82,7 @@ Class | Method | HTTP request | Description
8182
- [User](docs/User.md)
8283
- [Vehicle](docs/Vehicle.md)
8384
- [WithInnerOneOf](docs/WithInnerOneOf.md)
85+
- [WithInnerOneOfFoo](docs/WithInnerOneOfFoo.md)
8486

8587

8688
To get access to the crate's generated documentation, use:

‎samples/client/petstore/rust/reqwest-trait/petstore/docs/WithInnerOneOf.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**foo** | Option<[**models::Order**](Order.md)> | | [optional]
7+
**foo** | Option<[**models::WithInnerOneOfFoo**](WithInnerOneOf_foo.md)> | | [optional]
88

99
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1010

‎samples/client/petstore/rust/reqwest-trait/petstore/src/models/duplicate_one_of.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
1515
#[serde(untagged)]
1616
pub enum DuplicateOneOf {
1717
Order(Box<models::Order>),
18+
Order(Box<models::Order>),
1819
}
1920

2021
impl Default for DuplicateOneOf {

0 commit comments

Comments
 (0)