update discriminator to discriminatorName (#142)

modules/openapi-generator/src/main/resources/Java/JSON.mustache

@@ -71,7 +71,7 @@ public class JSON {
                 classByDiscriminatorValue.put("{{classname}}".toUpperCase(), {{classname}}.class);
                 return getClassByDiscriminator(
                                            classByDiscriminatorValue,
-                                           getDiscriminatorValue(readElement, "{{discriminator}}"));
+                                           getDiscriminatorValue(readElement, "{{{discriminatorName}}}"));
             }
           })
         {{/parent}}

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache

@@ -68,7 +68,7 @@ public class JSON {
                 classByDiscriminatorValue.put("{{classname}}".toUpperCase(), {{classname}}.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
-                            getDiscriminatorValue(readElement, "{{discriminator}}"));
+                            getDiscriminatorValue(readElement, "{{{discriminatorName}}}"));
             }
           })
         {{/parent}}

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -74,7 +74,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/parent}}
   {{#gson}}
   {{#discriminator}}
-    this.{{discriminator}} = this.getClass().getSimpleName();
+    this.{{{discriminatorName}}} = this.getClass().getSimpleName();
   {{/discriminator}}
   {{/gson}}
   }
@@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{#gson}}
   {{#discriminator}}
   public {{classname}}() {
-    this.{{discriminator}} = this.getClass().getSimpleName();
+    this.{{{discriminatorName}}} = this.getClass().getSimpleName();
   }
   {{/discriminator}}
   {{/gson}}

modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/JavaInflector/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/JavaJaxRS/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/JavaPlayFramework/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/JavaSpring/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache

@@ -3,7 +3,7 @@
     /// </summary>
     [DataContract]
     {{#discriminator}}
-    [JsonConverter(typeof(JsonSubtypes), "{{discriminator}}")]{{#children}}
+    [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]{{#children}}
     [JsonSubtypes.KnownSubType(typeof({{classname}}), "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}")]{{/children}}
     {{/discriminator}}
     {{#generatePropertyChanged}}

modules/openapi-generator/src/main/resources/elm/modelTypeDiscriminator.mustache

@@ -6,13 +6,13 @@ type {{classname}}
 
 {{classVarName}}Decoder : Decoder {{classname}}
 {{classVarName}}Decoder =
-    Decode.field "{{discriminator}}" Decode.string
+    Decode.field "{{{discriminatorName}}}" Decode.string
         |> Decode.andThen {{classVarName}}TypeDecoder
 
 
 {{classVarName}}TypeDecoder : String -> Decoder {{classname}}
-{{classVarName}}TypeDecoder {{discriminator}} =
+{{classVarName}}TypeDecoder {{{discriminatorName}}} =
-    case {{discriminator}} of
+    case {{{discriminatorName}}} of
 {{#children}}
         "{{vendorExtensions.x-discriminator-value}}" ->
             Decode.map {{classname}}Type {{classVarName}}Decoder
@@ -20,8 +20,8 @@ type {{classname}}
 {{/children}}
         _ ->
             Decode.fail <|
-                "Trying to decode {{classname}}, but {{discriminator}} "
+                "Trying to decode {{classname}}, but {{{discriminatorName}}} "
-                ++ toString {{discriminator}} ++ " is not supported."
+                ++ toString {{{discriminatorName}}} ++ " is not supported."
 
 
 {{classVarName}}Encoder : {{classname}} -> Encode.Value

modules/openapi-generator/src/main/resources/java-pkmst/typeInfoAnnotation.mustache

@@ -1,5 +1,5 @@
 {{#jackson}}
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{discriminator}}", visible = true )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminatorName}}}", visible = true )
 @JsonSubTypes({
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

modules/openapi-generator/src/main/resources/objc/model-body.mustache

@@ -23,7 +23,7 @@
  * Maps "discriminator" value to the sub-class name, so that inheritance is supported.
  */
 - (id)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
-    NSString * discriminatedClassName = [dict valueForKey:@"{{discriminator}}"];
+    NSString * discriminatedClassName = [dict valueForKey:@"{{{discriminatorName}}}"];
     if(discriminatedClassName == nil ){
          return [super initWithDictionary:dict error:err];
     }

modules/openapi-generator/src/main/resources/python/model.mustache

@@ -60,7 +60,7 @@ class {{classname}}(object):
 {{/-first}}
         self._{{name}} = None
 {{/vars}}
-        self.discriminator = {{#discriminator}}'{{discriminator}}'{{/discriminator}}{{^discriminator}}None{{/discriminator}}
+        self.discriminator = {{#discriminator}}'{{{discriminatorName}}}'{{/discriminator}}{{^discriminator}}None{{/discriminator}}
 {{#vars}}{{#-first}}
 {{/-first}}
 {{#required}}

modules/openapi-generator/src/main/resources/swift3/Models.mustache

@@ -328,7 +328,7 @@ class Decoders {
             if let sourceDictionary = source as? [AnyHashable: Any] {
             {{#discriminator}}
                 // Check discriminator to support inheritance
-                if let discriminator = sourceDictionary["{{discriminator}}"] as? String, instance == nil && discriminator != "{{classname}}"{
+                if let discriminator = sourceDictionary["{{{discriminatorName}}}"] as? String, instance == nil && discriminator != "{{classname}}"{
                     return Decoders.decode(clazz: {{classname}}.self, discriminator: discriminator, source: source)
                 }
             {{/discriminator}}

modules/openapi-generator/src/main/resources/typescript-node/api.mustache

@@ -145,7 +145,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 {{/vars}}
 
     {{#discriminator}}
-    static discriminator = {{discriminator}};
+    static discriminator = {{{discriminatorName}}};
     {{/discriminator}}
     {{^discriminator}}
     static discriminator = undefined;