From 2c2d6905cb1feae6fa90879d71509c52ebf1db97 Mon Sep 17 00:00:00 2001 From: Daniel Seiler Date: Sun, 4 Aug 2024 12:16:50 +0200 Subject: [PATCH] fix: remove "hack" to skip schema-mapped models (#19191) That method relied on the faulty assumption that toModelFilename does not consider mappings, which is not the case for multiple generators. --- .../java/org/openapitools/codegen/DefaultGenerator.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index ac1869f2d14..25eb78173f2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -469,14 +469,7 @@ public class DefaultGenerator implements Generator { try { //don't generate models that have an import mapping if (config.schemaMapping().containsKey(name)) { - LOGGER.debug("Model {} not imported due to import mapping", name); - - for (String templateName : config.modelTemplateFiles().keySet()) { - // HACK: Because this returns early, could lead to some invalid model reporting. - String filename = config.modelFilename(templateName, name); - Path path = java.nio.file.Paths.get(filename); - this.templateProcessor.skip(path, "Skipped prior to model processing due to schema mapping."); - } + LOGGER.info("Model {} not generated due to schema mapping", name); continue; }