Merge pull request #556 from swagger-api/ticket-527

frantuma · web-flow · commit a12d6752e8df · 2019-12-12T12:37:12.000+01:00
refs #527 - fix allOf discriminator processing
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -1324,7 +1324,7 @@ else if (schema instanceof ComposedSchema) {
                 if(composed.getAllOf() != null) {
                     for (Schema innerModel : composed.getAllOf()) {
                         if (codegenModel.discriminator == null) {
-                            codegenModel.discriminator = schema
+                            codegenModel.discriminator = innerModel
                                     .getDiscriminator();
                         }
                         if (innerModel.getXml() != null) {

Original file line number	Diff line number	Diff line change
`@@ -1324,7 +1324,7 @@ else if (schema instanceof ComposedSchema) {`
`1324`	`1324`	`if(composed.getAllOf() != null) {`
`1325`	`1325`	`for (Schema innerModel : composed.getAllOf()) {`
`1326`	`1326`	`if (codegenModel.discriminator == null) {`
`1327`		`- codegenModel.discriminator = schema`
	`1327`	`+ codegenModel.discriminator = innerModel`
`1328`	`1328`	`.getDiscriminator();`
`1329`	`1329`	`}`
`1330`	`1330`	`if (innerModel.getXml() != null) {`