Skip to content

fix(rust): correctly handle anyOf with inline primitives #22072

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 1 commit into
base: master
Choose a base branch
from
+87 −57
Open

fix(rust): correctly handle anyOf with inline primitives #22072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
121 changes: 64 additions & 57 deletions ...openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,70 +250,77 @@ public RustClientCodegen() {
public CodegenModel fromModel(String name, Schema model) {
CodegenModel mdl = super.fromModel(name, model);

// set correct names and baseNames to oneOf in composed-schema to use as enum variant names & mapping
if (mdl.getComposedSchemas() != null && mdl.getComposedSchemas().getOneOf() != null
&& !mdl.getComposedSchemas().getOneOf().isEmpty()) {

List<CodegenProperty> newOneOfs = mdl.getComposedSchemas().getOneOf().stream()
.map(CodegenProperty::clone)
.collect(Collectors.toList());
List<Schema> schemas = ModelUtils.getInterfaces(model);
if (newOneOfs.size() != schemas.size()) {
// For safety reasons, this should never happen unless there is an error in the code
throw new RuntimeException("oneOf size does not match the model");
}
if (mdl.getComposedSchemas() != null) {
processComposedSchemas(model, mdl, "oneOf");
processComposedSchemas(model, mdl, "anyOf");
}

Map<String, String> refsMapping = Optional.ofNullable(model.getDiscriminator())
.map(Discriminator::getMapping).orElse(Collections.emptyMap());

// Reverse mapped references to use as baseName for oneOF, but different keys may point to the same $ref.
// Thus, we group them by the value
Map<String, List<String>> mappedNamesByRef = refsMapping.entrySet().stream()
.collect(Collectors.groupingBy(Map.Entry::getValue,
Collectors.mapping(Map.Entry::getKey, Collectors.toList())
));

for (int i = 0; i < newOneOfs.size(); i++) {
CodegenProperty oneOf = newOneOfs.get(i);
Schema schema = schemas.get(i);

if (mappedNamesByRef.containsKey(schema.get$ref())) {
// prefer mapped names if present
// remove mapping not in order not to reuse for the next occurrence of the ref
List<String> names = mappedNamesByRef.get(schema.get$ref());
String mappedName = names.remove(0);
oneOf.setBaseName(mappedName);
oneOf.setName(toModelName(mappedName));
} else if (!org.apache.commons.lang3.StringUtils.isEmpty(schema.get$ref())) {
// use $ref if it's reference
String refName = ModelUtils.getSimpleRef(schema.get$ref());
if (refName != null) {
String modelName = toModelName(refName);
oneOf.setName(modelName);
oneOf.setBaseName(refName);
}
} else if (oneOf.isArray) {
// If the type is an array, extend the name with the inner type to prevent name collisions
// in case multiple arrays with different types are defined. If the user has manually specified
// a name, use that name instead.
String collectionWithTypeName = toModelName(schema.getType()) + oneOf.containerTypeMapped + oneOf.items.dataType;
String oneOfName = Optional.ofNullable(schema.getTitle()).orElse(collectionWithTypeName);
oneOf.setName(oneOfName);
}
else {
// In-placed type (primitive), because there is no mapping or ref for it.
// use camelized `title` if present, otherwise use `type`
String oneOfName = Optional.ofNullable(schema.getTitle()).orElseGet(schema::getType);
oneOf.setName(toModelName(oneOfName));
return mdl;
}

private void processComposedSchemas(Schema model, CodegenModel mdl, String type) {
List<CodegenProperty> schemasList = null;

if ("oneOf".equals(type)) {
schemasList = mdl.getComposedSchemas().getOneOf();
} else if ("anyOf".equals(type)) {
schemasList = mdl.getComposedSchemas().getAnyOf();
}

if (schemasList == null || schemasList.isEmpty()) return;

List<CodegenProperty> newComposed = schemasList.stream()
.map(CodegenProperty::clone)
.collect(Collectors.toList());

List<Schema> schemas = ModelUtils.getInterfaces(model);
if (newComposed.size() != schemas.size()) {
throw new RuntimeException(type + " size does not match the model");
}

Map<String, String> refsMapping = Optional.ofNullable(model.getDiscriminator())
.map(Discriminator::getMapping).orElse(Collections.emptyMap());

Map<String, List<String>> mappedNamesByRef = refsMapping.entrySet().stream()
.collect(Collectors.groupingBy(Map.Entry::getValue,
Collectors.mapping(Map.Entry::getKey, Collectors.toList())
));

for (int i = 0; i < newComposed.size(); i++) {
CodegenProperty variant = newComposed.get(i);
Schema schema = schemas.get(i);

if (mappedNamesByRef.containsKey(schema.get$ref())) {
List<String> names = mappedNamesByRef.get(schema.get$ref());
String mappedName = names.remove(0);
variant.setBaseName(mappedName);
variant.setName(toModelName(mappedName));
} else if (!org.apache.commons.lang3.StringUtils.isEmpty(schema.get$ref())) {
String refName = ModelUtils.getSimpleRef(schema.get$ref());
if (refName != null) {
String modelName = toModelName(refName);
variant.setName(modelName);
variant.setBaseName(refName);
}
} else if (variant.isArray) {
String collectionWithTypeName = toModelName(schema.getType()) + variant.containerTypeMapped + variant.items.dataType;
String name = Optional.ofNullable(schema.getTitle()).orElse(collectionWithTypeName);
variant.setName(name);
} else {
String name = Optional.ofNullable(schema.getTitle()).orElseGet(schema::getType);
variant.setName(toModelName(name));
}

mdl.getComposedSchemas().setOneOf(newOneOfs);
}

return mdl;
// Set the composed schema correctly
if ("oneOf".equals(type)) {
mdl.getComposedSchemas().setOneOf(newComposed);
} else if ("anyOf".equals(type)) {
mdl.getComposedSchemas().setAnyOf(newComposed);
}
}


@Override
public ModelsMap postProcessModels(ModelsMap objs) {
for (ModelMap model : objs.getModels()) {
Expand Down
23 changes: 23 additions & 0 deletions modules/openapi-generator/src/main/resources/rust/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,29 @@ pub enum {{classname}} {
{{/composedSchemas.oneOf}}
}

{{^anyOf.isEmpty}}
{{#description}}
/// {{{.}}}
{{/description}}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[serde(untagged)]
pub enum {{classname}} {
{{#composedSchemas.anyOf}}
{{#description}}
/// {{{.}}}
{{/description}}
{{{name}}}({{#isModel}}{{^avoidBoxedModels}}Box<{{/avoidBoxedModels}}{{/isModel}}{{{dataType}}}{{#isModel}}{{^avoidBoxedModels}}>{{/avoidBoxedModels}}{{/isModel}}),
{{/composedSchemas.anyOf}}
}

impl Default for {{classname}} {
fn default() -> Self {
{{#composedSchemas.anyOf}}{{#-first}}Self::{{{name}}}(Default::default()){{/-first}}{{/composedSchemas.anyOf}}
}
}
{{/anyOf.isEmpty}}


impl Default for {{classname}} {
fn default() -> Self {
{{#composedSchemas.oneOf}}{{#-first}}Self::{{{name}}}(Default::default()){{/-first}}{{/composedSchemas.oneOf}}
Expand Down