From 74fedfcf203eba16384c60c7bf8056968f1658ff Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 1 Mar 2016 15:01:10 +0800 Subject: [PATCH] Java: fix invalid imports when model name prefix/suffix is present When generating Java clients with mode name prefix/suffix given, there are invalid imports on Date and File, e.g. for the Petstore sample (with model name prefix set to "My" and suffix set to "Model"): import io.swagger.client.model.MyfileModel; import io.swagger.client.model.MyDateModel; This commit fixes it to: import java.io.File; import java.util.Date; --- .../java/io/swagger/codegen/languages/JavaClientCodegen.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 516fca1e8b6..27f8ddf7e58 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 @@ -83,6 +83,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { ); instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("map", "HashMap"); + typeMapping.put("date", "Date"); + typeMapping.put("file", "File"); cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); @@ -488,7 +490,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { if (typeMapping.containsKey(swaggerType)) { type = typeMapping.get(swaggerType); if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 || - type.equals("Map") || type.equals("List")) { + type.equals("Map") || type.equals("List") || + type.equals("File") || type.equals("Date")) { return type; } } else {