From b2aa877ce0a0febf527763570a56519e23b6c9a0 Mon Sep 17 00:00:00 2001 From: Matt Alleman Date: Wed, 15 Mar 2017 03:02:42 -0600 Subject: [PATCH] Allow for UUID types in akka-scala (#5069) * allow for UUID types * update sample libs --- .../src/main/resources/akka-scala/model.mustache | 1 + samples/client/petstore/akka-scala/pom.xml | 2 +- .../src/main/scala/io/swagger/client/api/PetApi.scala | 2 +- .../src/main/scala/io/swagger/client/api/UserApi.scala | 8 ++++---- .../main/scala/io/swagger/client/model/ApiResponse.scala | 1 + .../src/main/scala/io/swagger/client/model/Category.scala | 1 + .../src/main/scala/io/swagger/client/model/Order.scala | 1 + .../src/main/scala/io/swagger/client/model/Pet.scala | 1 + .../src/main/scala/io/swagger/client/model/Tag.scala | 1 + .../src/main/scala/io/swagger/client/model/User.scala | 1 + 10 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache index 7743c15718d..e5117e3a9cb 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache @@ -8,6 +8,7 @@ package {{package}} import {{invokerPackage}}.ApiModel import org.joda.time.DateTime +import java.util.UUID {{#models}} {{#model}} diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index af37db6dbab..0715ac9c4f6 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -217,7 +217,7 @@ 2.3.9 1.2 2.2 - 1.5.9 + 1.5.12 1.0.0 4.8.1 diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala index b59e7f912b4..50950fa51c2 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala @@ -5,9 +5,9 @@ */ package io.swagger.client.api -import io.swagger.client.model.Pet import io.swagger.client.model.ApiResponse import java.io.File +import io.swagger.client.model.Pet import io.swagger.client.core._ import io.swagger.client.core.CollectionFormats._ import io.swagger.client.core.ApiKeyLocations._ 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 642c76b8d8c..4b8b8c3631e 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 @@ -23,7 +23,7 @@ object UserApi { def createUser(body: User): ApiRequest[Unit] = ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user", "application/json") .withBody(body) - .withDefaultSuccessResponse[Unit] + .withSuccessResponse[Unit](0) /** * * Expected answers: @@ -34,7 +34,7 @@ object UserApi { def createUsersWithArrayInput(body: Seq[User]): ApiRequest[Unit] = ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user/createWithArray", "application/json") .withBody(body) - .withDefaultSuccessResponse[Unit] + .withSuccessResponse[Unit](0) /** * * Expected answers: @@ -45,7 +45,7 @@ object UserApi { def createUsersWithListInput(body: Seq[User]): ApiRequest[Unit] = ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user/createWithList", "application/json") .withBody(body) - .withDefaultSuccessResponse[Unit] + .withSuccessResponse[Unit](0) /** * This can only be done by the logged in user. * @@ -105,7 +105,7 @@ object UserApi { */ def logoutUser(): ApiRequest[Unit] = ApiRequest[Unit](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/logout", "application/json") - .withDefaultSuccessResponse[Unit] + .withSuccessResponse[Unit](0) /** * This can only be done by the logged in user. * diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala index 0b996a89cc5..4357803cae8 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class ApiResponse ( code: Option[Int], diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala index 48af020f18d..4cf271ca1dd 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class Category ( id: Option[Long], diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala index 3c2d7a255e2..0c5ce261e04 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class Order ( id: Option[Long], diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala index 2adadb61eaa..c7be875c9b4 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class Pet ( id: Option[Long], diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala index 6658e733b4e..99718dd7444 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class Tag ( id: Option[Long], diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala index 6db0c80fc33..11b66fc5c00 100644 --- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala @@ -8,6 +8,7 @@ package io.swagger.client.model import io.swagger.client.core.ApiModel import org.joda.time.DateTime +import java.util.UUID case class User ( id: Option[Long],