loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Some clean-ups for the Javascript client codegen

Browse Source
This commit is contained in:
xhh 2015-12-15 19:38:04 +08:00
parent 89f269969d
commit 3f3e444ab1
7 changed files with 14 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
View File

@ -34,15 +34,8 @@ import org.slf4j.LoggerFactory;
public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig { public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(JavascriptClientCodegen.class); private static final Logger LOGGER = LoggerFactory.getLogger(JavascriptClientCodegen.class);
protected String invokerPackage = "io.swagger.client";
protected String groupId = "io.swagger";
protected String artifactId = "swagger-java-client";
protected String artifactVersion = "1.0.0";
protected String sourceFolder = "src"; protected String sourceFolder = "src";
protected String localVariablePrefix = ""; protected String localVariablePrefix = "";
protected boolean fullJavaUtil = false;
protected String javaUtilPrefix = "";
protected Boolean serializableModel = false;
public JavascriptClientCodegen() { public JavascriptClientCodegen() {
super(); super();
@ -80,14 +73,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
instantiationTypes.put("map", "HashMap"); instantiationTypes.put("map", "HashMap");
cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC));
cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC));
cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC));
cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC)); cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC));
cliOptions.add(new CliOption(CodegenConstants.SERIALIZABLE_MODEL, CodegenConstants.SERIALIZABLE_MODEL_DESC));
cliOptions.add(new CliOption("fullJavaUtil", "whether to use fully qualified name for classes under java.util (default to false)"));
} }
@Override @Override
@ -108,9 +95,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
@Override @Override
public void processOpts() { public void processOpts() {
super.processOpts(); super.processOpts();
typeMapping.put("array", "Array");
typeMapping.put("array", "Array");
} }
@Override @Override
@ -198,84 +183,42 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
@Override @Override
public String toDefaultValue(Property p) { public String toDefaultValue(Property p) {
if (p instanceof ArrayProperty) { if (p instanceof ArrayProperty) {
final ArrayProperty ap = (ArrayProperty) p; return "[]";
final String pattern;
//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) { } else if (p instanceof MapProperty) {
final MapProperty ap = (MapProperty) p; return "{}";
final String pattern;
if (fullJavaUtil) {
pattern = "new java.util.HashMap<String, %s>()";
} else {
pattern = "new HashMap<String, %s>()";
}
return String.format(pattern, getTypeDeclaration(ap.getAdditionalProperties()));
} else if (p instanceof LongProperty) { } else if (p instanceof LongProperty) {
LongProperty dp = (LongProperty) p; LongProperty dp = (LongProperty) p;
if (dp.getDefault() != null) { if (dp.getDefault() != null) {
return dp.getDefault().toString()+"l"; return dp.getDefault().toString()+"l";
} }
return "null"; return "null";
// added for Javascript // added for Javascript
} else if (p instanceof RefProperty) { } else if (p instanceof RefProperty) {
RefProperty rp = (RefProperty)p; 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() + "()";
return "new " +rp.getSimpleRef() + "()";
} }
System.out.println("property: " + p);
return super.toDefaultValue(p); return super.toDefaultValue(p);
} }
@Override @Override
public String toDefaultValueWithParam(String name, Property p) { public String toDefaultValueWithParam(String name, Property p) {
if (p instanceof ArrayProperty) { if (p instanceof ArrayProperty) {
final ArrayProperty ap = (ArrayProperty) p; return " = new Array();";
final String pattern;
// 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) { } else if (p instanceof MapProperty) {
final MapProperty ap = (MapProperty) p; return " = {}";
final String pattern;
if (fullJavaUtil) {
pattern = " = new java.util.HashMap<String, %s>()";
} else {
pattern = "new HashMap<String, %s>()";
}
return String.format(pattern, getTypeDeclaration(ap.getAdditionalProperties()))+ ";";
} else if (p instanceof LongProperty) { } else if (p instanceof LongProperty) {
LongProperty dp = (LongProperty) p; LongProperty dp = (LongProperty) p;
return " = data." + name + ";"; return " = data." + name + ";";
// added for Javascript // added for Javascript
} else if (p instanceof RefProperty) { } else if (p instanceof RefProperty) {
RefProperty rp = (RefProperty)p; 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 ".constructFromObject(data." + name + ");";
return ".constructFromObject(data." + name + ");";
} }
System.out.println("property: " + p);
return super.toDefaultValueWithParam(name, p); return super.toDefaultValueWithParam(name, p);
} }
@ -449,7 +392,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
} }
} }
} }
if(removedChildEnum) { if(removedChildEnum) {
// If we removed an entry from this model's vars, we need to ensure hasMore is updated // If we removed an entry from this model's vars, we need to ensure hasMore is updated
int count = 0, numVars = codegenProperties.size(); int count = 0, numVars = codegenProperties.size();
@ -464,22 +407,6 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
return codegenModel; return codegenModel;
} }
public void setInvokerPackage(String invokerPackage) {
this.invokerPackage = invokerPackage;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
public void setArtifactVersion(String artifactVersion) {
this.artifactVersion = artifactVersion;
}
public void setSourceFolder(String sourceFolder) { public void setSourceFolder(String sourceFolder) {
this.sourceFolder = sourceFolder; this.sourceFolder = sourceFolder;
} }
@ -488,15 +415,6 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
this.localVariablePrefix = localVariablePrefix; this.localVariablePrefix = localVariablePrefix;
} }
public Boolean getSerializableModel() {
return serializableModel;
}
public void setSerializableModel(Boolean serializableModel) {
this.serializableModel = serializableModel;
}
private String sanitizePackageName(String packageName) { private String sanitizePackageName(String packageName) {
packageName = packageName.trim(); packageName = packageName.trim();
packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_"); packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");

4
modules/swagger-codegen/src/main/resources/Javascript/api.mustache
View File

@ -1,7 +1,3 @@
/*
* {{>generatedAnnotation}}
*/
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define(['jquery'], function($) { define(['jquery'], function($) {

1
modules/swagger-codegen/src/main/resources/Javascript/generatedAnnotation.mustache
View File

@ -1 +0,0 @@
@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")

4
samples/client/petstore/javascript/src/scripts/rest/api/PetApi.js
View File

@ -1,7 +1,3 @@
/*
* @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavascriptClientCodegen", date = "2015-12-09T16:07:21.000+07:00")
*/
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define(['jquery'], function($) { define(['jquery'], function($) {

4
samples/client/petstore/javascript/src/scripts/rest/api/StoreApi.js
View File

@ -1,7 +1,3 @@
/*
* @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavascriptClientCodegen", date = "2015-12-09T16:07:21.000+07:00")
*/
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define(['jquery'], function($) { define(['jquery'], function($) {

4
samples/client/petstore/javascript/src/scripts/rest/api/UserApi.js
View File

@ -1,7 +1,3 @@
/*
* @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavascriptClientCodegen", date = "2015-12-09T16:07:21.000+07:00")
*/
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define(['jquery'], function($) { define(['jquery'], function($) {

2
samples/client/petstore/javascript/src/scripts/rest/model/Pet.js
View File

@ -66,7 +66,7 @@ var Pet = function Pet(photoUrls, name) {
/** /**
* datatype: Array * datatype: Array
**/ **/
self.tags = new Array(); self.tags = [];
/** /**
* pet status in the store * pet status in the store