Skip to content

[Scala][Akka] Ensure identifiers get sanitized & model names have the same formatting #5098

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
wing328 merged 1 commit into from
Mar 21, 2017
Merged

[Scala][Akka] Ensure identifiers get sanitized & model names have the same formatting #5098

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
8 changes: 6 additions & 2 deletions ...es/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public String toOperationId(String operationId) {
}

private String formatIdentifier(String name, boolean capitalized) {
String identifier = camelize(name, true);
String identifier = camelize(sanitizeName(name), true);
if (capitalized) {
identifier = StringUtils.capitalize(identifier);
}
Expand Down Expand Up @@ -290,6 +290,11 @@ public String toDefaultValue(Property p) {
}
}

@Override
public String toModelName(final String name) {
return formatIdentifier(name, true);
}

private static abstract class CustomLambda implements Mustache.Lambda {
@Override
public void execute(Template.Fragment frag, Writer out) throws IOException {
Expand All @@ -301,7 +306,6 @@ public void execute(Template.Fragment frag, Writer out) throws IOException {
public abstract String formatFragment(String fragment);
}


private static class JavadocLambda extends CustomLambda {
@Override
public String formatFragment(String fragment) {
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ object UserApi {
.withErrorResponse[Unit](400)

object LoginUserHeaders {
def `x-Rate-Limit`(r: ApiReturnWithHeaders) = r.getIntHeader("X-Rate-Limit")
def `x-Expires-After`(r: ApiReturnWithHeaders) = r.getDateTimeHeader("X-Expires-After")
def xRateLimit(r: ApiReturnWithHeaders) = r.getIntHeader("X-Rate-Limit")
def xExpiresAfter(r: ApiReturnWithHeaders) = r.getDateTimeHeader("X-Expires-After")
}
/**
*
Expand Down