Skip to content

Commit

Permalink
Fix Java Generator to always generate valid Java variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
markac committed Oct 3, 2013
1 parent f17654c commit 7bde2ff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/main/resources/Java/api.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public class {{classname}} {
{{/requiredParamCount}}

{{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
queryParams.put("{{paramName}}", String.valueOf({{paramName}}));
queryParams.put("{{baseName}}", String.valueOf({{paramName}}));
{{/queryParams}}

{{#headerParams}}headerParams.put("{{paramName}}", {{paramName}});
{{#headerParams}}headerParams.put("{{baseName}}", {{paramName}});
{{/headerParams}}

String contentType = "application/json";
Expand All @@ -68,4 +68,4 @@ public class {{classname}} {
}
{{/operation}}
}
{{/operations}}
{{/operations}}
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ class BasicJavaGenerator extends BasicGenerator {
// file suffix
override def fileSuffix = ".java"

override def toVarName(name: String): String = {
val paramName = name.replaceAll("[^a-zA-Z0-9_]","")
super.toVarName(paramName)
}

// response classes
override def processResponseClass(responseClass: String): Option[String] = {
responseClass match {
Expand Down Expand Up @@ -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"),
("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"))
}
}

0 comments on commit 7bde2ff

Please sign in to comment.