Add a method returns discriminator name

refs wing328/openapi-generator-backup#9 (comment)
OpenAPITools · Apr 1, 2018 · 28fcf48 · 28fcf48
1 parent 7daa2ec
commit 28fcf48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -331,7 +331,11 @@ public void setUnescapedDescription(String unescapedDescription) {
         this.unescapedDescription = unescapedDescription;
     }
 
-    public String getDiscriminator() {
+    public Discriminator getDiscriminator() {
+        return discriminator;
+    }
+
+    public String getDiscriminatorName() {
         return discriminator == null ? null : discriminator.getPropertyName();
     }
 

diff --git a/modules/openapi-generator/src/main/resources/php/model_generic.mustache b/modules/openapi-generator/src/main/resources/php/model_generic.mustache
@@ -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}}
     }