Skip to content

Commit c24b9f3

Browse files
committed
skip discriminator property assignment for enums.
1 parent 90e7bb7 commit c24b9f3

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3271,6 +3271,10 @@ private void addVars(CodegenModel m, List<CodegenProperty> vars, Map<String, Pro
32713271
// FIXME: readWriteVars can contain duplicated properties. Debug/breakpoint here while running C# generator (Dog and Cat models)
32723272
m.readWriteVars.add(cp);
32733273
}
3274+
3275+
if (m.discriminator != null && cp.name.equals(m.discriminator) && cp.isEnum) {
3276+
m.vendorExtensions.put("x-discriminator-is-enum", true);
3277+
}
32743278
}
32753279
}
32763280
}

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,21 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
7474
{{/parent}}
7575
{{#gson}}
7676
{{#discriminator}}
77+
{{^vendorExtensions.x-discriminator-is-enum}}
7778
this.{{discriminatorClassVarName}} = this.getClass().getSimpleName();
79+
{{/vendorExtensions.x-discriminator-is-enum}}
7880
{{/discriminator}}
7981
{{/gson}}
8082
}
8183
{{/parcelableModel}}
8284
{{^parcelableModel}}
8385
{{#gson}}
8486
{{#discriminator}}
87+
{{^vendorExtensions.x-discriminator-is-enum}}
8588
public {{classname}}() {
8689
this.{{discriminatorClassVarName}} = this.getClass().getSimpleName();
8790
}
91+
{{/vendorExtensions.x-discriminator-is-enum}}
8892
{{/discriminator}}
8993
{{/gson}}
9094
{{/parcelableModel}}

0 commit comments

Comments
 (0)