From 59fe50dd7487a6ec90a4d8c2375ac764eada6bf3 Mon Sep 17 00:00:00 2001 From: Paul English Date: Tue, 21 Mar 2017 00:35:38 -0600 Subject: [PATCH] Ensure identifiers get sanitized; Ensure model names also have the same formatting (#5098) --- .../swagger/codegen/languages/AkkaScalaClientCodegen.java | 8 ++++++-- .../src/main/scala/io/swagger/client/api/UserApi.scala | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java index d77763a126da..1ead8de061f2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java @@ -231,7 +231,7 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code } private String formatIdentifier(String name, boolean capitalized) { - String identifier = camelize(name, true); + String identifier = camelize(sanitizeName(name), true); if (capitalized) { identifier = StringUtils.capitalize(identifier); } @@ -290,6 +290,11 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code } } + @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 { @@ -301,7 +306,6 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code public abstract String formatFragment(String fragment); } - private static class JavadocLambda extends CustomLambda { @Override public String formatFragment(String fragment) { diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala index 4b8b8c3631e4..d1f95bdc18d1 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala @@ -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") } /** *