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

Bug fixes based on report (#16728)

Browse Source 
* bug fixes based on report

* fix
This commit is contained in:
William Cheng 2023-10-05 13:02:05 +08:00 committed by GitHub
parent 6722f1300d
commit effbe8caad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3556,7 +3556,7 @@ public class DefaultCodegen implements CodegenConfig {
.map(ve -> ve.get("x-discriminator-value")) .map(ve -> ve.get("x-discriminator-value"))
.map(discriminatorValue -> (String) discriminatorValue) .map(discriminatorValue -> (String) discriminatorValue)
.orElse(currentSchemaName); .orElse(currentSchemaName);
MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName), mappingName != currentSchemaName); MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName), !mappingName.equals(currentSchemaName));
descendentSchemas.add(mm); descendentSchemas.add(mm);
} }
return descendentSchemas; return descendentSchemas;

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
View File

@ -769,11 +769,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
public String toDefaultValue(Schema p) { public String toDefaultValue(Schema p) {
if (p.getEnum() != null && !p.getEnum().isEmpty()) { if (p.getEnum() != null && !p.getEnum().isEmpty()) {
if (p.getDefault() != null) { if (p.getDefault() != null) {
if (ModelUtils.isStringSchema(p)) { return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
} else {
return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
}
} }
} }
if (p.getDefault() != null) { if (p.getDefault() != null) {

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java
View File

@ -395,11 +395,7 @@ public class SwiftCombineClientCodegen extends DefaultCodegen implements Codegen
public String toDefaultValue(Schema p) { public String toDefaultValue(Schema p) {
if (p.getEnum() != null && !p.getEnum().isEmpty()) { if (p.getEnum() != null && !p.getEnum().isEmpty()) {
if (p.getDefault() != null) { if (p.getDefault() != null) {
if (ModelUtils.isStringSchema(p)) { return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
} else {
return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
}
} }
} }
if (p.getDefault() != null) { if (p.getDefault() != null) {