From 64c99504b4589af5409d959bc4b7e41d4f3ed413 Mon Sep 17 00:00:00 2001 From: Bartek Kowalik Date: Sat, 11 Apr 2020 22:23:48 +0200 Subject: [PATCH] Fix Scala sttp generator packages (#5890) * Fix Scala sttp generator packages * Change package to parameterised --- .../openapitools/codegen/languages/ScalaSttpClientCodegen.java | 2 -- .../src/main/resources/scala-sttp/apiInvoker.mustache | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java index dd1e8846860..43b48cb3114 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java @@ -28,8 +28,6 @@ import java.io.File; import java.util.List; public class ScalaSttpClientCodegen extends ScalaAkkaClientCodegen implements CodegenConfig { - protected String mainPackage = "org.openapitools.client"; - public ScalaSttpClientCodegen() { super(); generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache index 254e92c74aa..3d468d61b59 100644 --- a/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache +++ b/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache @@ -4,7 +4,7 @@ package {{{mainPackage}}}.core import org.json4s._ import sttp.client._ import sttp.model.StatusCode -import org.openapitools.client.api.EnumsSerializers +import {{{apiPackage}}}.EnumsSerializers import sttp.client.json4s.SttpJson4sApi import sttp.client.monad.MonadError