loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-02 21:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98 from markac/master

Browse Source 
Fix Java Generator to always generate valid Java variable names
This commit is contained in:
Tony Tam 2013-10-07 22:10:28 -07:00
commit 2c5524476e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/Java/api.mustache
View File

@ -41,10 +41,10 @@ public class {{classname}} {
{{/requiredParamCount}} {{/requiredParamCount}}
{{#queryParams}}if(!"null".equals(String.valueOf({{paramName}}))) {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
queryParams.put("{{paramName}}", String.valueOf({{paramName}})); queryParams.put("{{baseName}}", String.valueOf({{paramName}}));
{{/queryParams}} {{/queryParams}}
{{#headerParams}}headerParams.put("{{paramName}}", {{paramName}}); {{#headerParams}}headerParams.put("{{baseName}}", {{paramName}});
{{/headerParams}} {{/headerParams}}
String contentType = "application/json"; String contentType = "application/json";
@ -68,4 +68,4 @@ public class {{classname}} {
} }
{{/operation}} {{/operation}}
} }
{{/operations}} {{/operations}}

7
src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
View File

@ -93,6 +93,11 @@ class BasicJavaGenerator extends BasicGenerator {
// file suffix // file suffix
override def fileSuffix = ".java" override def fileSuffix = ".java"
override def toVarName(name: String): String = {
val paramName = name.replaceAll("[^a-zA-Z0-9_]","")
super.toVarName(paramName)
}
// response classes // response classes
override def processResponseClass(responseClass: String): Option[String] = { override def processResponseClass(responseClass: String): Option[String] = {
responseClass match { responseClass match {
@ -209,4 +214,4 @@ class BasicJavaGenerator extends BasicGenerator {
("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"), ("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("pom.mustache", "generated-code/java", "pom.xml")) ("pom.mustache", "generated-code/java", "pom.xml"))
} }