loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

show error when schema in discriminator mapping is undefined (#11127)

Browse Source
This commit is contained in:
William Cheng 2021-12-15 22:18:39 +08:00 committed by GitHub
parent b2daa5a836
commit c27ddc67fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -3170,10 +3170,16 @@ public class DefaultCodegen implements CodegenConfig {
List<MappedModel> uniqueDescendants = new ArrayList(); List<MappedModel> uniqueDescendants = new ArrayList();
if (sourceDiscriminator.getMapping() != null && !sourceDiscriminator.getMapping().isEmpty()) { if (sourceDiscriminator.getMapping() != null && !sourceDiscriminator.getMapping().isEmpty()) {
for (Entry<String, String> e : sourceDiscriminator.getMapping().entrySet()) { for (Entry<String, String> e : sourceDiscriminator.getMapping().entrySet()) {
String nameOrRef = e.getValue(); String name;
String name = nameOrRef.indexOf('/') >= 0 ? ModelUtils.getSimpleRef(nameOrRef) : nameOrRef; if (e.getValue().indexOf('/') >= 0) {
String modelName = toModelName(name); name = ModelUtils.getSimpleRef(e.getValue());
uniqueDescendants.add(new MappedModel(e.getKey(), modelName)); if (ModelUtils.getSchema(openAPI, name) == null) {
LOGGER.error("Failed to lookup the schema '{}' when processing the discriminator mapping of oneOf/anyOf. Please check to ensure it's defined properly.", name);
}
} else {
name = e.getValue();
}
uniqueDescendants.add(new MappedModel(e.getKey(), toModelName(name)));
} }
} }