From f7779c545e03476285176f834a5eb19620243062 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 8 Jan 2018 00:20:38 +0800 Subject: [PATCH] refactor abstract scala codegen (#7334) --- .../swagger/codegen/languages/AbstractScalaCodegen.java | 8 +++++++- .../io/swagger/codegen/languages/ScalaClientCodegen.java | 6 ------ .../codegen/languages/ScalaLagomServerCodegen.java | 6 ------ .../swagger/codegen/languages/ScalatraServerCodegen.java | 7 ------- .../io/swagger/codegen/languages/ScalazClientCodegen.java | 6 ------ samples/client/petstore/scala/.swagger-codegen/VERSION | 2 +- .../src/main/scala/io/swagger/client/api/PetApi.scala | 2 ++ 7 files changed, 10 insertions(+), 27 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractScalaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractScalaCodegen.java index cf45b77527f..5628f0bc29b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractScalaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractScalaCodegen.java @@ -211,4 +211,10 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen { int lastIndexOfDot = input.lastIndexOf("."); return input.substring(lastIndexOfDot + 1); } -} \ No newline at end of file + + @Override + public String escapeQuotationMark(String input) { + // remove " to avoid code injection + return input.replace("\"", ""); + } +} diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java index f28a3491f22..1c66b3a6a53 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java @@ -235,10 +235,4 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC return formatIdentifier(stripPackageName(property.baseName), true); } - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java index dcf16f399c0..ef175b5f5e0 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java @@ -218,12 +218,6 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod return camelizedName; } - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - @Override public Map postProcessModelsEnum(Map objs) { objs = super.postProcessModelsEnum(objs); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java index 065dd8409b5..5bc218262c2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java @@ -151,11 +151,4 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg return objs; } - - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalazClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalazClientCodegen.java index 3a13d269ff0..3ab3594bf3c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalazClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalazClientCodegen.java @@ -235,12 +235,6 @@ public class ScalazClientCodegen extends AbstractScalaCodegen implements Codegen public abstract String formatFragment(String fragment); } - @Override - public String escapeQuotationMark(String input) { - // remove " to avoid code injection - return input.replace("\"", ""); - } - private class EnumEntryLambda extends CustomLambda { @Override public String formatFragment(String fragment) { diff --git a/samples/client/petstore/scala/.swagger-codegen/VERSION b/samples/client/petstore/scala/.swagger-codegen/VERSION index cc6612c36e0..b4308ebebb5 100644 --- a/samples/client/petstore/scala/.swagger-codegen/VERSION +++ b/samples/client/petstore/scala/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0 \ No newline at end of file +2.4.0-SNAPSHOT diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala index 7ee97e2ae40..bf3ebb47a92 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala @@ -340,6 +340,7 @@ class PetApiAsyncHelper(client: TransportClient, config: SwaggerConfig) extends val headerParams = new mutable.HashMap[String, String] if (status == null) throw new Exception("Missing required parameter 'status' when calling PetApi->findPetsByStatus") + queryParams += "status" -> status.toString val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "") @@ -357,6 +358,7 @@ class PetApiAsyncHelper(client: TransportClient, config: SwaggerConfig) extends val headerParams = new mutable.HashMap[String, String] if (tags == null) throw new Exception("Missing required parameter 'tags' when calling PetApi->findPetsByTags") + queryParams += "tags" -> tags.toString val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")