From e3bca56bfbb0032d382fe79cd2a8565f4aad630c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 8 Jun 2022 14:21:16 +0800 Subject: [PATCH] temp fix --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 4 ++-- .../java/org/openapitools/codegen/utils/ModelUtils.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index e4b539e27117..87f38471222b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2201,9 +2201,9 @@ public class DefaultCodegen implements CodegenConfig { // get the schema/model name from $ref String schemaName = ModelUtils.getSimpleRef(unaliasSchema.get$ref()); if (StringUtils.isNotEmpty(schemaName)) { - if (importMapping.containsKey(schemaName)) { + /*if (importMapping.containsKey(schemaName)) { return schemaName; - } + }*/ return getAlias(schemaName); } else { LOGGER.warn("Error obtaining the datatype from ref: {}. Default to 'object'", unaliasSchema.get$ref()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index cb475a64c203..f70ef646c723 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1206,10 +1206,10 @@ public class ModelUtils { if (schema != null && StringUtils.isNotEmpty(schema.get$ref())) { String simpleRef = ModelUtils.getSimpleRef(schema.get$ref()); - if (importMappings.containsKey(simpleRef)) { - LOGGER.debug("Schema unaliasing of {} omitted because aliased class is to be mapped to {}", simpleRef, importMappings.get(simpleRef)); + /*if (importMappings.containsKey(simpleRef)) { + LOGGER.info("Schema unaliasing of {} omitted because aliased class is to be mapped to {}", simpleRef, importMappings.get(simpleRef)); return schema; - } + }*/ Schema ref = allSchemas.get(simpleRef); if (ref == null) { once(LOGGER).warn("{} is not defined", schema.get$ref());