From 81d307d8ca7968744c7974ae067ba419c00a9374 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 May 2020 10:05:15 +0800 Subject: [PATCH] add composed schema check (#6286) --- .../openapitools/codegen/languages/AbstractJavaCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index b0778f11f038..2ba884ebb86c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -22,6 +22,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.util.SchemaTypeUtil; @@ -796,7 +797,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } return String.format(Locale.ROOT, pattern, typeDeclaration); - } else if (ModelUtils.isMapSchema(schema)) { + } else if (ModelUtils.isMapSchema(schema) && !(schema instanceof ComposedSchema)) { final String pattern; if (fullJavaUtil) { pattern = "new java.util.HashMap<%s>()";