From 5f3d974a08bb34995065c1fff8d5fb24f8804b09 Mon Sep 17 00:00:00 2001 From: Marvin1912 <37240802+Marvin1912@users.noreply.github.com> Date: Fri, 25 Sep 2020 05:25:13 +0200 Subject: [PATCH] [bug][Java] Honor instantiationMap for default values for array, map, set (#4982) Co-authored-by: Jim Schubert --- .../languages/AbstractJavaCodegen.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) 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 872d954d3fa..4521ca49ea7 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 @@ -807,17 +807,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (ModelUtils.isArraySchema(schema)) { final String pattern; if (ModelUtils.isSet(schema)) { - if (fullJavaUtil) { - pattern = "new java.util.LinkedHashSet<%s>()"; - } else { - pattern = "new LinkedHashSet<%s>()"; - } + String mapInstantiationType = instantiationTypes().getOrDefault("set", "LinkedHashSet"); + pattern = "new " + mapInstantiationType + "<%s>()"; } else { - if (fullJavaUtil) { - pattern = "new java.util.ArrayList<%s>()"; - } else { - pattern = "new ArrayList<%s>()"; - } + String arrInstantiationType = instantiationTypes().getOrDefault("array", "ArrayList"); + pattern = "new " + arrInstantiationType + "<%s>()"; } Schema items = getSchemaItems((ArraySchema) schema); @@ -840,12 +834,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } return null; } - final String pattern; - if (fullJavaUtil) { - pattern = "new java.util.HashMap<%s>()"; - } else { - pattern = "new HashMap<%s>()"; - } + + String mapInstantiationType = instantiationTypes().getOrDefault("map", "HashMap"); + final String pattern = "new " + mapInstantiationType + "<%s>()"; + if (getAdditionalProperties(schema) == null) { return null; }