Skip to content

[scala-http4s] Fix name mapping of discriminator property #23853

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
MichaelKutzner wants to merge 4 commits into
base: master
Choose a base branch
from
+10 −10
Open

[scala-http4s] Fix name mapping of discriminator property #23853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf17340
Fix discriminator mapping
MichaelKutzner May 17, 2026
772c397
Fix issue for discriminator mapping
MichaelKutzner May 17, 2026
78d2663
Fix issue for nested oneOf (not sealed trait)
MichaelKutzner May 17, 2026
f38a62e
Merge branch 'master' into min_changes
MichaelKutzner May 23, 2026
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
4 changes: 2 additions & 2 deletions ...-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
childModel.getVendorExtensions().put("x-oneOfParent", cModel.classname);
// Store parent's discriminator info for use in template
if (cModel.discriminator != null) {
childModel.getVendorExtensions().put("x-parentDiscriminatorName", cModel.discriminator.getPropertyName());
childModel.getVendorExtensions().put("x-parentDiscriminatorBaseName", cModel.discriminator.getPropertyBaseName());
}
oneOfMembers.add(childModel);

Expand Down Expand Up @@ -461,7 +461,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
for (CodegenModel member : oneOfMembers) {
member.getVendorExtensions().remove("x-isOneOfMember");
member.getVendorExtensions().remove("x-oneOfParent");
member.getVendorExtensions().remove("x-parentDiscriminatorName");
member.getVendorExtensions().remove("x-parentDiscriminatorBaseName");
}

if (oneOfMembers.isEmpty()) {
Expand Down
16 changes: 8 additions & 8 deletions modules/openapi-generator/src/main/resources/scala-http4s/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ object {{classname}} {
// with discriminator, no mapping
given encoder{{classname}}: Encoder[{{classname}}] = Encoder.instance {
{{#vendorExtensions.x-discriminator-entries}}
case obj: {{classname}} => obj.asJson.mapObject(("{{discriminator.propertyName}}" -> "{{schemaName}}".asJson) +: _)
case obj: {{classname}} => obj.asJson.mapObject(("{{discriminator.propertyBaseName}}" -> "{{schemaName}}".asJson) +: _)
{{/vendorExtensions.x-discriminator-entries}}
}

given decoder{{classname}}: Decoder[{{classname}}] = Decoder.instance { cursor =>
cursor.downField("{{discriminator.propertyName}}").as[String].flatMap {
cursor.downField("{{discriminator.propertyBaseName}}").as[String].flatMap {
{{#vendorExtensions.x-discriminator-entries}}
case "{{schemaName}}" => cursor.as[{{classname}}]
{{/vendorExtensions.x-discriminator-entries}}
Expand All @@ -63,12 +63,12 @@ object {{classname}} {
{{#discriminator}}
given encoder{{classname}}: Encoder[{{classname}}] = Encoder.instance {
{{#mappedModels}}
case obj: {{model.classname}} => obj.asJson.mapObject(("{{propertyName}}" -> "{{mappingName}}".asJson) +: _)
case obj: {{model.classname}} => obj.asJson.mapObject(("{{propertyBaseName}}" -> "{{mappingName}}".asJson) +: _)
{{/mappedModels}}
}

given decoder{{classname}}: Decoder[{{classname}}] = Decoder.instance { cursor =>
cursor.downField("{{propertyName}}").as[String].flatMap {
cursor.downField("{{propertyBaseName}}").as[String].flatMap {
{{#mappedModels}}
case "{{mappingName}}" => cursor.as[{{model.classname}}]
{{/mappedModels}}
Expand Down Expand Up @@ -109,12 +109,12 @@ object {{classname}} {
// with discriminator, no mapping
given encoder{{classname}}: Encoder[{{classname}}] = Encoder.instance {
{{#vendorExtensions.x-oneOfMembers}}
case obj: {{classname}} => obj.asJson.mapObject(("{{vendorExtensions.x-parentDiscriminatorName}}" -> "{{name}}".asJson) +: _)
case obj: {{classname}} => obj.asJson.mapObject(("{{vendorExtensions.x-parentDiscriminatorBaseName}}" -> "{{name}}".asJson) +: _)
{{/vendorExtensions.x-oneOfMembers}}
}

given decoder{{classname}}: Decoder[{{classname}}] = Decoder.instance { cursor =>
cursor.downField("{{discriminator.propertyName}}").as[String].flatMap {
cursor.downField("{{discriminator.propertyBaseName}}").as[String].flatMap {
{{#vendorExtensions.x-oneOfMembers}}
case "{{name}}" => cursor.as[{{classname}}]
{{/vendorExtensions.x-oneOfMembers}}
Expand All @@ -128,12 +128,12 @@ object {{classname}} {
{{#discriminator}}
given encoder{{classname}}: Encoder[{{classname}}] = Encoder.instance {
{{#mappedModels}}
case obj: {{model.classname}} => obj.asJson.mapObject(("{{propertyName}}" -> "{{mappingName}}".asJson) +: _)
case obj: {{model.classname}} => obj.asJson.mapObject(("{{propertyBaseName}}" -> "{{mappingName}}".asJson) +: _)
{{/mappedModels}}
}

given decoder{{classname}}: Decoder[{{classname}}] = Decoder.instance { cursor =>
cursor.downField("{{propertyName}}").as[String].flatMap {
cursor.downField("{{propertyBaseName}}").as[String].flatMap {
{{#mappedModels}}
case "{{mappingName}}" => cursor.as[{{model.classname}}]
{{/mappedModels}}
Expand Down
Loading