Skip to content

Fix Java Generator to always generate valid Java variable names #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2013
Merged

Fix Java Generator to always generate valid Java variable names #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/resources/Java/api.mustache
View file
Open in desktop
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}}
7 changes: 6 additions & 1 deletion src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
View file
Open in desktop
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"))
}
}