Skip to content

fix(cpp-qt-client): add asJsonObject method to OAIEnum class (#19307) #21211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(cpp-qt-client): add asJsonObject method to OAIEnum class (#19307) #21211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
543675d
add asJsonObject method to OAIEnum class to fix enum handling in quer…
ReallyVirtual May 8, 2025
74daaa1
update samples
wing328 May 9, 2025
beb4118
Merge https://github.com/openapitools/openapi-generator into fix-cpp-…
wing328 May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifndef {{prefix}}_ENUM_H
#define {{prefix}}_ENUM_H

#include <QJsonObject>
#include <QJsonValue>
#include <QMetaType>
#include <QString>
Expand All @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#ifndef PFX_ENUM_H
#define PFX_ENUM_H

#include <QJsonObject>
#include <QJsonValue>
#include <QMetaType>
#include <QString>
Expand All @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/cpp-qt/client/PFXEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#ifndef PFX_ENUM_H
#define PFX_ENUM_H

#include <QJsonObject>
#include <QJsonValue>
#include <QMetaType>
#include <QString>
Expand All @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/hyper/petstore/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum DuplicateOneOf {
Order(Box<models::Order>),
Order(Box<models::Order>),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why there are changes to rust samples

can you please file a new PR based on the latest master to see if these changes to rust samples no longer appear?

}

impl Default for DuplicateOneOf {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/hyper/petstore/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/hyper0x/petstore/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/hyper0x/petstore/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest-trait/petstore/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest-trait/petstore/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions ...les/client/petstore/rust/reqwest/petstore-async-middleware/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...lient/petstore/rust/reqwest/petstore-async-middleware/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions ...es/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...ient/petstore/rust/reqwest/petstore-async-tokensource/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore-async/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore-async/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum DuplicateOneOf {
Order(models::Order),
Order(models::Order),
}

impl Default for DuplicateOneOf {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(models::Order),
Order(models::Order),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions .../client/petstore/rust/reqwest/petstore-awsv4signature/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions ...lient/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum FooDuplicateOneOf {
FooOrder(Box<models::FooOrder>),
FooOrder(Box<models::FooOrder>),
}

impl Default for FooDuplicateOneOf {
Expand Down
1 change: 1 addition & 0 deletions .../petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum FooWithInnerOneOfFoo {
FooOrder(Box<models::FooOrder>),
FooOrder(Box<models::FooOrder>),
}

impl Default for FooWithInnerOneOfFoo {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore/src/models/duplicate_one_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/rust/reqwest/petstore/src/models/with_inner_one_of_foo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
#[serde(untagged)]
pub enum WithInnerOneOfFoo {
Order(Box<models::Order>),
Order(Box<models::Order>),
}

impl Default for WithInnerOneOfFoo {
Expand Down
Loading