From a607856406e61cf111a9e10cdfb7b2b2ee5eb9a6 Mon Sep 17 00:00:00 2001 From: xhh Date: Fri, 22 Jan 2016 11:48:59 +0800 Subject: [PATCH] JavaScript: fix model name in initialization and import Closes #1935 --- .../codegen/languages/JavascriptClientCodegen.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java index c6b381a5632..27aad0ebbff 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java @@ -279,7 +279,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo @Override public String toModelImport(String name) { - return name; + return toModelName(name); } @Override @@ -308,17 +308,9 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo return "[]"; } else if (p instanceof MapProperty) { return "{}"; - } else if (p instanceof LongProperty) { - LongProperty dp = (LongProperty) p; - if (dp.getDefault() != null) { - return dp.getDefault().toString()+"l"; - } - return "null"; - - // added for Javascript } else if (p instanceof RefProperty) { RefProperty rp = (RefProperty)p; - return "new " +rp.getSimpleRef() + "()"; + return "new " + getTypeDeclaration(p) + "()"; } return super.toDefaultValue(p);