loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[scala-sttp] Bump minor versions of libraries, SBT and Scala (#9356)

Browse Source
This commit is contained in:
Sheldon Young 2021-05-12 06:29:51 -07:00 committed by GitHub
parent be06541b47
commit f9cd80deed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/generators/scala-sttp.md
View File

@ -13,8 +13,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8| |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|jodaTimeVersion|The version of joda-time library| |2.10.6| |jodaTimeVersion|The version of joda-time library| |2.10.10|
|json4sVersion|The version of json4s library| |3.6.8| |json4sVersion|The version of json4s library| |3.6.11|
|jsonLibrary|Json library to use. Possible values are: json4s and circe.| |json4s| |jsonLibrary|Json library to use. Possible values are: json4s and circe.| |json4s|
|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true| |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
|mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client| |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
|sourceFolder|source folder for generated code| |null| |sourceFolder|source folder for generated code| |null|
|sttpClientVersion|The version of sttp client| |2.2.0| |sttpClientVersion|The version of sttp client| |2.2.9|
## IMPORT MAPPING ## IMPORT MAPPING

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
View File

@ -44,15 +44,15 @@ import static org.openapitools.codegen.utils.StringUtils.camelize;
public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig { public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
private static final StringProperty STTP_CLIENT_VERSION = new StringProperty("sttpClientVersion", "The version of " + private static final StringProperty STTP_CLIENT_VERSION = new StringProperty("sttpClientVersion", "The version of " +
"sttp client", "2.2.0"); "sttp client", "2.2.9");
private static final BooleanProperty USE_SEPARATE_ERROR_CHANNEL = new BooleanProperty("separateErrorChannel", private static final BooleanProperty USE_SEPARATE_ERROR_CHANNEL = new BooleanProperty("separateErrorChannel",
"Whether to return response as " + "Whether to return response as " +
"F[Either[ResponseError[ErrorType], ReturnType]]] or to flatten " + "F[Either[ResponseError[ErrorType], ReturnType]]] or to flatten " +
"response's error raising them through enclosing monad (F[ReturnType]).", true); "response's error raising them through enclosing monad (F[ReturnType]).", true);
private static final StringProperty JODA_TIME_VERSION = new StringProperty("jodaTimeVersion", "The version of " + private static final StringProperty JODA_TIME_VERSION = new StringProperty("jodaTimeVersion", "The version of " +
"joda-time library", "2.10.6"); "joda-time library", "2.10.10");
private static final StringProperty JSON4S_VERSION = new StringProperty("json4sVersion", "The version of json4s " + private static final StringProperty JSON4S_VERSION = new StringProperty("json4sVersion", "The version of json4s " +
"library", "3.6.8"); "library", "3.6.11");
private static final StringProperty CIRCE_VERSION = new StringProperty("circeVersion", "The version of circe " + private static final StringProperty CIRCE_VERSION = new StringProperty("circeVersion", "The version of circe " +
"library", "0.13.0"); "library", "0.13.0");
private static final JsonLibraryProperty JSON_LIBRARY_PROPERTY = new JsonLibraryProperty(); private static final JsonLibraryProperty JSON_LIBRARY_PROPERTY = new JsonLibraryProperty();

4
modules/openapi-generator/src/main/resources/scala-sttp/build.sbt.mustache vendored
View File

@ -2,8 +2,8 @@ version := "{{artifactVersion}}"
name := "{{artifactId}}" name := "{{artifactId}}"
organization := "{{groupId}}" organization := "{{groupId}}"
scalaVersion := "2.13.2" scalaVersion := "2.13.5"
crossScalaVersions := Seq(scalaVersion.value, "2.12.10") crossScalaVersions := Seq(scalaVersion.value, "2.12.13")
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.softwaremill.sttp.client" %% "core" % "{{sttpClientVersion}}", "com.softwaremill.sttp.client" %% "core" % "{{sttpClientVersion}}",

3
modules/openapi-generator/src/main/resources/scala-sttp/project/build.properties.mustache vendored
View File

@ -1 +1,2 @@
sbt.version=1.3.12 sbt.version=1.5.0

10
samples/client/petstore/scala-sttp/build.sbt
View File

@ -2,13 +2,13 @@ version := "1.0.0"
name := "scala-sttp-petstore" name := "scala-sttp-petstore"
organization := "org.openapitools" organization := "org.openapitools"
scalaVersion := "2.13.2" scalaVersion := "2.13.5"
crossScalaVersions := Seq(scalaVersion.value, "2.12.10") crossScalaVersions := Seq(scalaVersion.value, "2.12.13")
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.softwaremill.sttp.client" %% "core" % "2.2.0", "com.softwaremill.sttp.client" %% "core" % "2.2.9",
"com.softwaremill.sttp.client" %% "json4s" % "2.2.0", "com.softwaremill.sttp.client" %% "json4s" % "2.2.9",
"org.json4s" %% "json4s-jackson" % "3.6.8" "org.json4s" %% "json4s-jackson" % "3.6.11"
) )
scalacOptions := Seq( scalacOptions := Seq(

3
samples/client/petstore/scala-sttp/project/build.properties
View File

@ -1 +1,2 @@
sbt.version=1.3.12 sbt.version=1.5.0