From 70bcf22c82970fbacf737bd110913294ac0fb348 Mon Sep 17 00:00:00 2001 From: Paul Ebermann Date: Wed, 24 Feb 2016 16:43:20 +0100 Subject: [PATCH] [feature #1255] fix import problem pointed out during review. Instead of declaring `Map` and `List` as primitive (which caused them to be not imported anymore), now we exclude them from the model name transformation in `JavaClientCodegen.getSwaggerType`. --- .../io/swagger/codegen/languages/JavaClientCodegen.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 821f77ca1794..3ea6a28afe07 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -219,9 +219,6 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { importMapping.remove("DateTime"); instantiationTypes.put("array", "java.util.ArrayList"); instantiationTypes.put("map", "java.util.HashMap"); - } else { - languageSpecificPrimitives.add("List"); - languageSpecificPrimitives.add("Map"); } this.sanitizeConfig(); @@ -490,7 +487,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { String type = null; if (typeMapping.containsKey(swaggerType)) { type = typeMapping.get(swaggerType); - if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0) { + if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 || + type.equals("Map") || type.equals("List")) { return type; } } else {