Merge branch 'master' into 780-python-flask-dependencies

jstockdi-marstone · web-flow · commit 8924e8016cf1 · 2020-10-30T09:40:21.000-04:00
diff --git a/src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java
@@ -752,7 +752,7 @@ public String getSchemaType(Schema propertySchema) {
 
         if (propertySchema.get$ref() != null) {
             final Schema refSchema = OpenAPIUtil.getSchemaFromName(swaggerType, this.openAPI);
-            if (refSchema != null && !isObjectSchema(refSchema) && refSchema.getEnum() == null) {
+            if (refSchema != null && !isObjectSchema(refSchema) && !(refSchema instanceof ArraySchema || refSchema instanceof MapSchema) && refSchema.getEnum() == null) {
                 swaggerType = super.getSchemaType(refSchema);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ public String getSchemaType(Schema propertySchema) {`
`752`	`752`
`753`	`753`	`if (propertySchema.get$ref() != null) {`
`754`	`754`	`final Schema refSchema = OpenAPIUtil.getSchemaFromName(swaggerType, this.openAPI);`
`755`		`- if (refSchema != null && !isObjectSchema(refSchema) && refSchema.getEnum() == null) {`
	`755`	`+ if (refSchema != null && !isObjectSchema(refSchema) && !(refSchema instanceof ArraySchema \|\| refSchema instanceof MapSchema) && refSchema.getEnum() == null) {`
`756`	`756`	`swaggerType = super.getSchemaType(refSchema);`
`757`	`757`	`}`
`758`	`758`	`}`