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

Merge pull request #9 from ackintosh/fix-discriminator

Browse Source 
Fix broken discriminator
This commit is contained in:
William Cheng
2018-04-01 19:09:54 +08:00
committed by GitHub
parent 240d1fe7eb 28fcf48f42
commit 2fb9ce43b5
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,6 +335,10 @@ public class CodegenModel {
return discriminator;
}
public String getDiscriminatorName() {
return discriminator == null ? null : discriminator.getPropertyName();
}
public void setDiscriminator(Discriminator discriminator) {
this.discriminator = discriminator;
}

4
modules/openapi-generator/src/main/resources/php/model_generic.mustache
View File

@@ -1,6 +1,6 @@
class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^parentSchema}}implements ModelInterface, ArrayAccess{{/parentSchema}}
{
const DISCRIMINATOR = {{#discriminator}}'{{discriminator}}'{{/discriminator}}{{^discriminator}}null{{/discriminator}};
const DISCRIMINATOR = {{#discriminator}}'{{discriminatorName}}'{{/discriminator}}{{^discriminator}}null{{/discriminator}};
/**
* The original name of the model.
@@ -166,7 +166,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
{{#discriminator}}
// Initialize discriminator property with the model name.
$discriminator = array_search('{{discriminator}}', self::$attributeMap);
$discriminator = array_search('{{discriminatorName}}', self::$attributeMap);
$this->container[$discriminator] = static::$swaggerModelName;
{{/discriminator}}
}