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

Fix broken discriminator

Browse Source
This commit is contained in:
akihito.nakano 2018-04-01 18:29:13 +09:00
parent 24db65b2b9
commit 7daa2ec5da
2 changed files with 4 additions and 4 deletions
Show Stats 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

@ -331,8 +331,8 @@ public class CodegenModel {
this.unescapedDescription = unescapedDescription; this.unescapedDescription = unescapedDescription;
} }
public Discriminator getDiscriminator() { public String getDiscriminator() {
return discriminator; return discriminator == null ? null : discriminator.getPropertyName();
} }
public void setDiscriminator(Discriminator discriminator) { public void setDiscriminator(Discriminator discriminator) {

4
samples/openapi3/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
View File

@ -42,7 +42,7 @@ use \Swagger\Client\ObjectSerializer;
*/ */
class Animal implements ModelInterface, ArrayAccess class Animal implements ModelInterface, ArrayAccess
{ {
const DISCRIMINATOR = 'Discriminator{propertyName='className', mapping=null}'; const DISCRIMINATOR = 'className';
/** /**
* The original name of the model. * The original name of the model.
@ -186,7 +186,7 @@ class Animal implements ModelInterface, ArrayAccess
$this->container['color'] = isset($data['color']) ? $data['color'] : 'red'; $this->container['color'] = isset($data['color']) ? $data['color'] : 'red';
// Initialize discriminator property with the model name. // Initialize discriminator property with the model name.
$discriminator = array_search('Discriminator{propertyName='className', mapping=null}', self::$attributeMap); $discriminator = array_search('className', self::$attributeMap);
$this->container[$discriminator] = static::$swaggerModelName; $this->container[$discriminator] = static::$swaggerModelName;
} }