diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java index e149a288c7b..4d2dd1b0f94 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java @@ -17,28 +17,26 @@ package org.openapitools.codegen.languages; +import com.samskivert.mustache.Escapers; +import com.samskivert.mustache.Mustache; +import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.Schema; +import org.apache.commons.lang3.StringUtils; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.DefaultCodegen; +import org.openapitools.codegen.utils.ModelUtils; + import java.io.File; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import com.samskivert.mustache.Escapers; -import com.samskivert.mustache.Mustache; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.DefaultCodegen; -import org.openapitools.codegen.utils.ModelUtils; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.*; - -import org.apache.commons.lang3.StringUtils; - public abstract class AbstractScalaCodegen extends DefaultCodegen { protected String modelPropertyNaming = "camelCase"; - protected String invokerPackage = "io.swagger.client"; + protected String invokerPackage = "org.openapitools.client"; protected String sourceFolder = "src/main/scala"; protected boolean stripPackageName = true; @@ -123,14 +121,14 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen { } } - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - public String getSourceFolder() { return sourceFolder; } + public void setSourceFolder(String sourceFolder) { + this.sourceFolder = sourceFolder; + } + @Override public String escapeReservedWord(String name) { if (this.reservedWordsMappings().containsKey(name)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java index 1581ae5be95..0c354c48b7f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java @@ -18,12 +18,7 @@ package org.openapitools.codegen.languages; import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConfig; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.SupportingFile; +import org.openapitools.codegen.*; import java.io.File; import java.util.Arrays; @@ -34,19 +29,19 @@ public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements Code protected String gradleWrapperPackage = "gradle.wrapper"; protected boolean authPreemptive; protected boolean asyncHttpClient = !authScheme.isEmpty(); - protected String groupId = "io.swagger"; + protected String groupId = "org.openapitools"; protected String artifactId = "openapi-scala-client"; protected String artifactVersion = "1.0.0"; protected String clientName = "AsyncClient"; public ScalaHttpClientCodegen() { super(); - outputFolder = "generated-code/scala"; + outputFolder = "generated-code/scala-http-client"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); embeddedTemplateDir = templateDir = "scala"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; + apiPackage = "org.openapitools.client.api"; + modelPackage = "org.openapitools.client.model"; setReservedWordsLowerCase( Arrays.asList( @@ -115,7 +110,7 @@ public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements Code typeMapping.put("double", "Double"); typeMapping.put("object", "Any"); typeMapping.put("file", "File"); - typeMapping.put("binary", "Array[Byte]"); + typeMapping.put("binary", "File"); typeMapping.put("ByteArray", "Array[Byte]"); typeMapping.put("ArrayByte", "Array[Byte]"); typeMapping.put("date-time", "Date"); diff --git a/modules/openapi-generator/src/main/resources/scala/README.mustache b/modules/openapi-generator/src/main/resources/scala/README.mustache index 2ace2602c68..9522a76ad77 100644 --- a/modules/openapi-generator/src/main/resources/scala/README.mustache +++ b/modules/openapi-generator/src/main/resources/scala/README.mustache @@ -2,8 +2,10 @@ {{appName}} -{{#appDescription}}{{{appDescription}}}{{/appDescription}} +{{#appDescription}} +{{{appDescription}}} +{{/appDescription}} # VERSION Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: @@ -115,7 +117,7 @@ Your library files will be built under `WWW::MyProjectName`. $ cd openapi-generator $ mvn package $ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \ - -i [URL or file path to JSON swagger API spec] \ + -i [URL or file path to OpenAPI spec] \ -l akka-scala \ -c /path/to/config/file.json \ -o /path/to/output/folder diff --git a/modules/openapi-generator/src/main/resources/scala/api.mustache b/modules/openapi-generator/src/main/resources/scala/api.mustache index f67133052c8..aefca6a952f 100644 --- a/modules/openapi-generator/src/main/resources/scala/api.mustache +++ b/modules/openapi-generator/src/main/resources/scala/api.mustache @@ -7,29 +7,23 @@ import java.text.SimpleDateFormat {{/imports}} import {{invokerPackage}}.{ApiInvoker, ApiException} +import collection.mutable import com.sun.jersey.multipart.FormDataMultiPart import com.sun.jersey.multipart.file.FileDataBodyPart +import com.wordnik.swagger.client._ +import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ +import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ -import javax.ws.rs.core.MediaType - +import java.net.URI import java.io.File import java.util.Date import java.util.TimeZone - -import scala.collection.mutable.HashMap - -import com.wordnik.swagger.client._ -import scala.concurrent.Future -import collection.mutable - -import java.net.URI - -import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ -import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ +import javax.ws.rs.core.MediaType import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent._ import scala.concurrent.duration._ +import scala.collection.mutable.HashMap import scala.util.{Failure, Success, Try} import org.json4s._ diff --git a/modules/openapi-generator/src/main/resources/scala/pom.mustache b/modules/openapi-generator/src/main/resources/scala/pom.mustache index e720f32e7e9..495ff623d35 100644 --- a/modules/openapi-generator/src/main/resources/scala/pom.mustache +++ b/modules/openapi-generator/src/main/resources/scala/pom.mustache @@ -231,7 +231,7 @@ com.wordnik.swagger swagger-async-httpclient_2.11 - ${swagger-async-httpclient-version} + ${async-httpclient-version} @@ -247,7 +247,7 @@ 4.12 3.1.5 3.0.4 - 0.3.5 + 0.3.5 UTF-8 diff --git a/samples/client/petstore/scala/build.gradle b/samples/client/petstore/scala/build.gradle index d2d4f3e874f..399197f950b 100644 --- a/samples/client/petstore/scala/build.gradle +++ b/samples/client/petstore/scala/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' -group = 'io.swagger' +group = 'org.openapitools' version = '1.0.0' buildscript { diff --git a/samples/client/petstore/scala/build.sbt b/samples/client/petstore/scala/build.sbt index 31f6b7a1e70..95c39ce8569 100644 --- a/samples/client/petstore/scala/build.sbt +++ b/samples/client/petstore/scala/build.sbt @@ -1,6 +1,6 @@ version := "1.0.0" name := "openapi-scala-client" -organization := "io.swagger" +organization := "org.openapitools" scalaVersion := "2.11.12" libraryDependencies ++= Seq( diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index c30b04c3c07..995f7c78e18 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - io.swagger + org.openapitools openapi-scala-client jar openapi-scala-client @@ -231,7 +231,7 @@ com.wordnik.swagger swagger-async-httpclient_2.11 - ${swagger-async-httpclient-version} + ${async-httpclient-version} @@ -247,7 +247,7 @@ 4.12 3.1.5 3.0.4 - 0.3.5 + 0.3.5 UTF-8 diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/ApiInvoker.scala similarity index 99% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/ApiInvoker.scala index 068be0b6565..885c71199db 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/ApiInvoker.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client +package org.openapitools.client import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.ClientResponse diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/AsyncClient.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/AsyncClient.scala similarity index 84% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/AsyncClient.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/AsyncClient.scala index 44b642c913c..2cb5c7f5d2d 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/AsyncClient.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/AsyncClient.scala @@ -1,6 +1,6 @@ -package io.swagger.client +package org.openapitools.client -import io.swagger.client.api._ +import org.openapitools.client.api._ import com.wordnik.swagger.client._ diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/PetApi.scala similarity index 98% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/PetApi.scala index f431c6a69d8..7031416f34b 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -10,38 +10,32 @@ * Do not edit the class manually. */ -package io.swagger.client.api +package org.openapitools.client.api import java.text.SimpleDateFormat -import io.swagger.client.model.ApiResponse +import org.openapitools.client.model.ApiResponse import java.io.File -import io.swagger.client.model.Pet -import io.swagger.client.{ApiInvoker, ApiException} +import org.openapitools.client.model.Pet +import org.openapitools.client.{ApiInvoker, ApiException} +import collection.mutable import com.sun.jersey.multipart.FormDataMultiPart import com.sun.jersey.multipart.file.FileDataBodyPart +import com.wordnik.swagger.client._ +import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ +import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ -import javax.ws.rs.core.MediaType - +import java.net.URI import java.io.File import java.util.Date import java.util.TimeZone - -import scala.collection.mutable.HashMap - -import com.wordnik.swagger.client._ -import scala.concurrent.Future -import collection.mutable - -import java.net.URI - -import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ -import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ +import javax.ws.rs.core.MediaType import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent._ import scala.concurrent.duration._ +import scala.collection.mutable.HashMap import scala.util.{Failure, Success, Try} import org.json4s._ diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/StoreApi.scala similarity index 98% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/StoreApi.scala index c43dd76fa93..6028a5f1816 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/StoreApi.scala @@ -10,36 +10,30 @@ * Do not edit the class manually. */ -package io.swagger.client.api +package org.openapitools.client.api import java.text.SimpleDateFormat -import io.swagger.client.model.Order -import io.swagger.client.{ApiInvoker, ApiException} +import org.openapitools.client.model.Order +import org.openapitools.client.{ApiInvoker, ApiException} +import collection.mutable import com.sun.jersey.multipart.FormDataMultiPart import com.sun.jersey.multipart.file.FileDataBodyPart +import com.wordnik.swagger.client._ +import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ +import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ -import javax.ws.rs.core.MediaType - +import java.net.URI import java.io.File import java.util.Date import java.util.TimeZone - -import scala.collection.mutable.HashMap - -import com.wordnik.swagger.client._ -import scala.concurrent.Future -import collection.mutable - -import java.net.URI - -import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ -import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ +import javax.ws.rs.core.MediaType import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent._ import scala.concurrent.duration._ +import scala.collection.mutable.HashMap import scala.util.{Failure, Success, Try} import org.json4s._ diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/UserApi.scala similarity index 98% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/UserApi.scala index 241551560a7..b48b1076445 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/api/UserApi.scala @@ -10,36 +10,30 @@ * Do not edit the class manually. */ -package io.swagger.client.api +package org.openapitools.client.api import java.text.SimpleDateFormat -import io.swagger.client.model.User -import io.swagger.client.{ApiInvoker, ApiException} +import org.openapitools.client.model.User +import org.openapitools.client.{ApiInvoker, ApiException} +import collection.mutable import com.sun.jersey.multipart.FormDataMultiPart import com.sun.jersey.multipart.file.FileDataBodyPart +import com.wordnik.swagger.client._ +import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ +import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ -import javax.ws.rs.core.MediaType - +import java.net.URI import java.io.File import java.util.Date import java.util.TimeZone - -import scala.collection.mutable.HashMap - -import com.wordnik.swagger.client._ -import scala.concurrent.Future -import collection.mutable - -import java.net.URI - -import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._ -import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._ +import javax.ws.rs.core.MediaType import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent._ import scala.concurrent.duration._ +import scala.collection.mutable.HashMap import scala.util.{Failure, Success, Try} import org.json4s._ diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala similarity index 92% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala index 36e3c35330a..090cbaddd4b 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model case class ApiResponse ( diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Category.scala similarity index 92% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Category.scala index 73928259c68..5040e0cb96f 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Category.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model case class Category ( diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Order.scala similarity index 94% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Order.scala index 0505a6bbc5b..72f09d7a74e 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Order.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model import java.util.Date diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Pet.scala similarity index 93% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Pet.scala index baeb2f17c21..1f060b10c7f 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Pet.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model case class Pet ( diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Tag.scala similarity index 92% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Tag.scala index 7246eec8ab7..da3cd4acd44 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/Tag.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model case class Tag ( diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/User.scala similarity index 94% rename from samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala rename to samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/User.scala index 4dfabe68efe..cd4c1c9b670 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/petstore/scala/src/main/scala/org/openapitools/client/model/User.scala @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package io.swagger.client.model +package org.openapitools.client.model case class User ( diff --git a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala index b5ae542a5fe..e75dae01493 100644 --- a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala @@ -1,6 +1,6 @@ -import io.swagger.client._ -import io.swagger.client.api._ -import io.swagger.client.model._ +import org.openapitools.client._ +import org.openapitools.client.api._ +import org.openapitools.client.model._ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @@ -21,7 +21,7 @@ class PetApiTest extends FlatSpec with Matchers { Some(Category(Some(1), Some("sold"))), "dragon", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList), + Some((for (i <- (1 to 5)) yield org.openapitools.client.model.Tag(Some(i), Some("tag-" + i))).toList), Some("lost") ) @@ -46,7 +46,7 @@ class PetApiTest extends FlatSpec with Matchers { Some(Category(Some(1), Some("sold"))), "programmer", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList), + Some((for (i <- (1 to 5)) yield org.openapitools.client.model.Tag(Some(i), Some("tag-" + i))).toList), Some("confused") ) diff --git a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala index 7618d7b48b2..29cdaec593f 100644 --- a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala @@ -1,6 +1,6 @@ -import io.swagger.client._ -import io.swagger.client.api._ -import io.swagger.client.model._ +import org.openapitools.client._ +import org.openapitools.client.api._ +import org.openapitools.client.model._ import org.joda.time.DateTime import org.junit.runner.RunWith diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala index b47f7002e96..a7942a788d9 100644 --- a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala @@ -1,6 +1,6 @@ -import io.swagger.client._ -import io.swagger.client.api._ -import io.swagger.client.model._ +import org.openapitools.client._ +import org.openapitools.client.api._ +import org.openapitools.client.model._ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner