From effbe8caad70e8e4eb4bfa1dfbd9f7ba9bae94cb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 5 Oct 2023 13:02:05 +0800 Subject: [PATCH] Bug fixes based on report (#16728) * bug fixes based on report * fix --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../openapitools/codegen/languages/Swift5ClientCodegen.java | 6 +----- .../codegen/languages/SwiftCombineClientCodegen.java | 6 +----- 3 files changed, 3 insertions(+), 11 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 ca04304a0e6..c3896078704 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 @@ -3556,7 +3556,7 @@ public class DefaultCodegen implements CodegenConfig { .map(ve -> ve.get("x-discriminator-value")) .map(discriminatorValue -> (String) discriminatorValue) .orElse(currentSchemaName); - MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName), mappingName != currentSchemaName); + MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName), !mappingName.equals(currentSchemaName)); descendentSchemas.add(mm); } return descendentSchemas; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index 6d4b2e28738..77c4e5016db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -769,11 +769,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig public String toDefaultValue(Schema p) { if (p.getEnum() != null && !p.getEnum().isEmpty()) { if (p.getDefault() != null) { - if (ModelUtils.isStringSchema(p)) { - return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); - } else { - return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); - } + return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); } } if (p.getDefault() != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java index e8508a890c3..36daf075bbf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java @@ -395,11 +395,7 @@ public class SwiftCombineClientCodegen extends DefaultCodegen implements Codegen public String toDefaultValue(Schema p) { if (p.getEnum() != null && !p.getEnum().isEmpty()) { if (p.getDefault() != null) { - if (ModelUtils.isStringSchema(p)) { - return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); - } else { - return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); - } + return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType()); } } if (p.getDefault() != null) {