loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2026-03-18 15:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix discriminator name not following variable naming convention (#1742)

Browse Source 
* fix discrimintator name not following variable naming convention

* fix test

* update samples

* use discriminator name directly in php

* single quote array index
This commit is contained in:
William Cheng
2018-12-24 10:17:43 +08:00
committed by GitHub
parent aed2c882da
commit 0dee995ebb
9 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,6 +235,7 @@ public class DefaultCodegen implements CodegenConfig {
allModels.put(modelName, cm);
}
}
// Fix up all parent and interface CodegenModel references.
for (CodegenModel cm : allModels.values()) {
if (cm.getParent() != null) {
@@ -250,6 +251,7 @@ public class DefaultCodegen implements CodegenConfig {
}
}
}
// Let parent know about all its children
for (String name : allModels.keySet()) {
CodegenModel cm = allModels.get(name);
@@ -1820,7 +1822,7 @@ public class DefaultCodegen implements CodegenConfig {
return null;
}
CodegenDiscriminator discriminator = new CodegenDiscriminator();
discriminator.setPropertyName(schema.getDiscriminator().getPropertyName());
discriminator.setPropertyName(toVarName(schema.getDiscriminator().getPropertyName()));
discriminator.setMapping(schema.getDiscriminator().getMapping());
if (schema.getDiscriminator().getMapping() != null && !schema.getDiscriminator().getMapping().isEmpty()) {
for (Entry<String, String> e : schema.getDiscriminator().getMapping().entrySet()) {