From 63fdd3eaf098b0e356eb1c3f7c86231458b7f6b7 Mon Sep 17 00:00:00 2001 From: johannes karoff Date: Sun, 11 Apr 2021 12:42:00 +0200 Subject: [PATCH] support uuid parameter (#9215) --- .../src/main/resources/scala-akka-client/requests.mustache | 2 ++ .../main/resources/scala-akka-client/serializers.mustache | 5 +++-- .../scala/org/openapitools/client/core/Serializers.scala | 5 +++-- .../main/scala/org/openapitools/client/core/requests.scala | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/requests.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/requests.mustache index 6dd3ab7d977..727d88f1818 100644 --- a/modules/openapi-generator/src/main/resources/scala-akka-client/requests.mustache +++ b/modules/openapi-generator/src/main/resources/scala-akka-client/requests.mustache @@ -3,6 +3,7 @@ package {{invokerPackage}} import java.io.File import java.net.URLEncoder +import java.util.UUID import java.time.OffsetDateTime import scala.util.Try @@ -181,6 +182,7 @@ object ParametersMap { case Some(opt) => formattedParams(name, opt) case s: Seq[Any] => formattedParams(name, ArrayValues(s)) case v: String => Seq((name, urlEncode(v))) + case v: UUID => formattedParams(name, v.toString) case NumericValue(v) => Seq((name, urlEncode(v))) case f: File => Seq((name, f)) case m: ApiModel => Seq((name, m)) diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/serializers.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/serializers.mustache index 6fcbaa2c35e..e66999529d9 100644 --- a/modules/openapi-generator/src/main/resources/scala-akka-client/serializers.mustache +++ b/modules/openapi-generator/src/main/resources/scala-akka-client/serializers.mustache @@ -9,6 +9,7 @@ import org.joda.time.format.ISODateTimeFormat import org.joda.time.{LocalDate, DateTime} {{/joda}} import org.json4s.{Serializer, CustomSerializer, JNull} +import org.json4s.ext.JavaTypesSerializers import org.json4s.JsonAST.JString import scala.util.Try @@ -47,6 +48,6 @@ object Serializers { })) {{/joda}} - def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ DateTimeSerializer :+ LocalDateSerializer + def all: Seq[Serializer[_]] = JavaTypesSerializers.all :+ DateTimeSerializer :+ LocalDateSerializer -} \ No newline at end of file +} diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/Serializers.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/Serializers.scala index 93d491af589..a569d56b498 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/Serializers.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/Serializers.scala @@ -3,6 +3,7 @@ package org.openapitools.client.core import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId} import java.time.format.DateTimeFormatter import org.json4s.{Serializer, CustomSerializer, JNull} +import org.json4s.ext.JavaTypesSerializers import org.json4s.JsonAST.JString import scala.util.Try @@ -25,6 +26,6 @@ object Serializers { JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE)) })) - def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ DateTimeSerializer :+ LocalDateSerializer + def all: Seq[Serializer[_]] = JavaTypesSerializers.all :+ DateTimeSerializer :+ LocalDateSerializer -} \ No newline at end of file +} diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/requests.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/requests.scala index 15b09453a97..f26a30cb278 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/requests.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/requests.scala @@ -13,6 +13,7 @@ package org.openapitools.client.core import java.io.File import java.net.URLEncoder +import java.util.UUID import java.time.OffsetDateTime import scala.util.Try @@ -191,6 +192,7 @@ object ParametersMap { case Some(opt) => formattedParams(name, opt) case s: Seq[Any] => formattedParams(name, ArrayValues(s)) case v: String => Seq((name, urlEncode(v))) + case v: UUID => formattedParams(name, v.toString) case NumericValue(v) => Seq((name, urlEncode(v))) case f: File => Seq((name, f)) case m: ApiModel => Seq((name, m))