From 359e39360a1dee217e2e58e3e3c7e270a5adedd3 Mon Sep 17 00:00:00 2001 From: Ken Kaizu Date: Wed, 3 Nov 2021 11:41:30 +0900 Subject: [PATCH] [scala-akka-http-server] Fix array optional parameter invalid default value (#10676) --- .../languages/ScalaAkkaHttpServerCodegen.java | 19 ++++++++++--------- .../.openapi-generator/VERSION | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java index e669b229788..ea4583aec17 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java @@ -264,16 +264,17 @@ public class ScalaAkkaHttpServerCodegen extends AbstractScalaCodegen implements @Override public CodegenParameter fromParameter(Parameter parameter, Set imports) { CodegenParameter param = super.fromParameter(parameter, imports); - // Removing unhandled types - if (!primitiveParamTypes.contains(param.dataType)) { - param.dataType = "String"; - } - if (!param.required) { - param.vendorExtensions.put("x-has-default-value", param.defaultValue != null); - // Escaping default string values - if (param.defaultValue != null && "String".equals(param.dataType)) { - param.defaultValue = String.format(Locale.ROOT, "\"%s\"", param.defaultValue); + if (primitiveParamTypes.contains(param.dataType)) { + if (!param.required) { + param.vendorExtensions.put("x-has-default-value", param.defaultValue != null); + // Escaping default string values + if (param.defaultValue != null && "String".equals(param.dataType)) { + param.defaultValue = String.format(Locale.ROOT, "\"%s\"", param.defaultValue); + } } + } else { + // Removing unhandled types + param.dataType = "String"; } return param; } diff --git a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION index d509cc92aa8..4b448de535c 100644 --- a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION +++ b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.1.1-SNAPSHOT \ No newline at end of file +5.3.0-SNAPSHOT \ No newline at end of file