From 34fb2c561f81c6e81bb61397a67791e6b4ddeab3 Mon Sep 17 00:00:00 2001 From: Johannes Fiala Date: Sat, 5 Dec 2015 21:11:55 +0100 Subject: [PATCH] cleanup build error due to missing CodegenConfig configuration entry #1294 --- .../io/swagger/codegen/DefaultCodegen.java | 18 +++++------ .../languages/JavascriptClientCodegen.java | 30 +++++++++++-------- .../main/resources/Javascript/api.mustache | 2 +- .../main/resources/Javascript/model.mustache | 2 +- .../services/io.swagger.codegen.CodegenConfig | 1 + 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index edeb9e89c88..29ccd153d00 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -588,39 +588,39 @@ public class DefaultCodegen { */ public String toDefaultValueWithParam(String name, Property p) { if (p instanceof StringProperty) { - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof BooleanProperty) { - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof DateProperty) { - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof DateTimeProperty) { - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof DoubleProperty) { DoubleProperty dp = (DoubleProperty) p; if (dp.getDefault() != null) { return dp.getDefault().toString(); } - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof FloatProperty) { FloatProperty dp = (FloatProperty) p; if (dp.getDefault() != null) { return dp.getDefault().toString(); } - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof IntegerProperty) { IntegerProperty dp = (IntegerProperty) p; if (dp.getDefault() != null) { return dp.getDefault().toString(); } - return "data." + name + ";"; + return " = data." + name + ";"; } else if (p instanceof LongProperty) { LongProperty dp = (LongProperty) p; if (dp.getDefault() != null) { return dp.getDefault().toString(); } - return "data." + name + ";"; + return " = data." + name + ";"; } else { - return "data." + name + ";"; + return " = data." + name + ";"; } } 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 264d1074d9b..8526b9c48c5 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 @@ -334,11 +334,13 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo if (p instanceof ArrayProperty) { final ArrayProperty ap = (ArrayProperty) p; final String pattern; - if (fullJavaUtil) { - pattern = "new java.util.ArrayList<%s>()"; - } else { - pattern = "new ArrayList<%s>()"; - } + //if (fullJavaUtil) { + // pattern = "new ArrayList()"; + //} else { + // pattern = "new ArrayList<%s>()"; + //} + + pattern = "new Array()"; return String.format(pattern, getTypeDeclaration(ap.getItems())); } else if (p instanceof MapProperty) { final MapProperty ap = (MapProperty) p; @@ -376,17 +378,19 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo if (p instanceof ArrayProperty) { final ArrayProperty ap = (ArrayProperty) p; final String pattern; - if (fullJavaUtil) { - pattern = "new java.util.ArrayList<%s>()"; - } else { - pattern = "new ArrayList<%s>()" ; - } +// if (fullJavaUtil) { +// pattern = "new java.util.ArrayList<%s>()"; +// } else { +// pattern = "new ArrayList<%s>()" ; +// } + pattern = " = new Array()" ; + return String.format(pattern, getTypeDeclaration(ap.getItems()))+ ";"; } else if (p instanceof MapProperty) { final MapProperty ap = (MapProperty) p; final String pattern; if (fullJavaUtil) { - pattern = "new java.util.HashMap()"; + pattern = " = new java.util.HashMap()"; } else { pattern = "new HashMap()"; } @@ -394,14 +398,14 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } else if (p instanceof LongProperty) { LongProperty dp = (LongProperty) p; - return "data." + name + ";"; + return " = data." + name + ";"; // added for Javascript } else if (p instanceof RefProperty) { RefProperty rp = (RefProperty)p; System.out.println("rp: " + rp.getName() + rp.getAccess() + rp.getDescription() + rp.getExample() + rp.getFormat() + rp.getSimpleRef() + rp.getTitle() + rp.getType()); - return "new " +rp.getSimpleRef() + "(data." + name + ");"; + return ".constructFromObject(data." + name + ");"; } System.out.println("property: " + p); diff --git a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache index 5e8254a143c..b4ae1c4096e 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache @@ -26,7 +26,7 @@ function {{classname}}() { {{/required}}{{/allParams}} // create path and map variables var {{localVariablePrefix}}path = '{{basePath}}' + replaceAll(replaceAll("{{{path}}}", "\\{format\\}","json"){{#pathParams}} -, "\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}); +, "\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString()){{/pathParams}}); var queryParams = {}; var headerParams = {}; diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache index 84812052df0..ca5e2c3230e 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache @@ -18,7 +18,7 @@ function {{classname}}() { {{#parent}}/* extends {{{parent}}}*/{{/parent}} self.constructFromObject = function(data) { {{#vars}} - self.{{name}} = {{{defaultValueWithParam}}} + self.{{name}}{{{defaultValueWithParam}}} {{/vars}} } diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index dd6e4d60b55..349fe78b4a0 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -5,6 +5,7 @@ io.swagger.codegen.languages.DartClientCodegen io.swagger.codegen.languages.FlashClientCodegen io.swagger.codegen.languages.FlaskConnexionCodegen io.swagger.codegen.languages.JavaClientCodegen +io.swagger.codegen.languages.JavascriptClientCodegen io.swagger.codegen.languages.JaxRSServerCodegen io.swagger.codegen.languages.JavaInflectorServerCodegen io.swagger.codegen.languages.NodeJSServerCodegen