Replaced ArrayList and HashMap pattern with generic one

Marvin1912 · Jan 12, 2020 · aacb4f3 · aacb4f3
1 parent b680d7c
commit aacb4f3
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -759,12 +759,8 @@ public String getAlias(String name) {
     public String toDefaultValue(Schema p) {
         p = ModelUtils.getReferencedSchema(this.openAPI, p);
         if (ModelUtils.isArraySchema(p)) {
-            final String pattern;
-            if (fullJavaUtil) {
-                pattern = "new java.util.ArrayList<%s>()";
-            } else {
-                pattern = "new ArrayList<%s>()";
-            }
+
+            final String pattern = "new " + instantiationTypes().get("array") + "<%s>()";
 
             Schema<?> items = getSchemaItems((ArraySchema) p);
 
@@ -779,12 +775,9 @@ public String toDefaultValue(Schema p) {
 
             return String.format(Locale.ROOT, pattern, typeDeclaration);
         } else if (ModelUtils.isMapSchema(p)) {
-            final String pattern;
-            if (fullJavaUtil) {
-                pattern = "new java.util.HashMap<%s>()";
-            } else {
-                pattern = "new HashMap<%s>()";
-            }
+
+            final String pattern = "new " + instantiationTypes().get("map") + "<%s>()";
+
             if (ModelUtils.getAdditionalProperties(p) == null) {
                 return null;
             }