Skip to content

Commit 79e738b

Browse files
committed
fix: new issues after merging master branch
1 parent e45e2c0 commit 79e738b

7 files changed

Lines changed: 65 additions & 2 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttp4ClientCodegen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public void processOpts() {
190190
supportingFiles.add(new SupportingFile("jsonSupport.mustache", invokerFolder, "JsonSupport.scala"));
191191
supportingFiles.add(new SupportingFile("additionalTypeSerializers.mustache", invokerFolder, "AdditionalTypeSerializers.scala"));
192192
supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
193+
supportingFiles.add(new SupportingFile("dateSerializers.mustache", invokerFolder, "DateSerializers.scala"));
193194
supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
194195
supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
195196
}

samples/client/petstore/scala-sttp4-circe/.openapi-generator/FILES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
.scalafmt.conf
12
README.md
23
build.sbt
34
project/build.properties
5+
project/plugins.sbt
46
src/main/scala/org/openapitools/client/api/PetApi.scala
57
src/main/scala/org/openapitools/client/api/StoreApi.scala
68
src/main/scala/org/openapitools/client/api/UserApi.scala
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.21.0-SNAPSHOT
1+
7.22.0-SNAPSHOT
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
version=3.10.6
2+
runner.dialect = scala213
3+
project {
4+
git = false
5+
excludeFilters = [
6+
scalafmt-benchmarks/src/resources,
7+
sbt-test
8+
bin/issue
9+
]
10+
layout = StandardConvention
11+
}
12+
align {
13+
preset = none
14+
stripMargin = true
15+
}
16+
binPack {
17+
importSelectors = fold
18+
}
19+
newlines {
20+
avoidForSimpleOverflow = all
21+
ignoreInSyntax = false
22+
source = fold
23+
}
24+
rewrite {
25+
rules = [
26+
AvoidInfix,
27+
Imports,
28+
RedundantBraces,
29+
RedundantParens,
30+
SortModifiers,
31+
]
32+
imports {
33+
selectors = fold
34+
removeRedundantSelectors = true
35+
sort = ascii
36+
groups = [
37+
["org\\.scalafmt\\..*"],
38+
["scala\\.meta\\..*", "org\\.scalameta\\..*"],
39+
["sbt\\..*"],
40+
["java.?\\..*"],
41+
["scala\\..*"],
42+
["org\\..*"],
43+
["com\\..*"],
44+
]
45+
}
46+
redundantBraces {
47+
preset = all
48+
oneStatApply {
49+
parensMaxSpan = 300
50+
bracesMinSpan = 300
51+
}
52+
}
53+
redundantParens {
54+
preset = all
55+
}
56+
sortModifiers.preset = styleGuide
57+
trailingCommas.style = "always"
58+
}

samples/client/petstore/scala-sttp4-circe/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
OpenAPI Petstore
44
- API version: 1.0.0
5-
- Generator version: 7.21.0-SNAPSHOT
5+
- Generator version: 7.22.0-SNAPSHOT
66

77
This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
88

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")

samples/client/petstore/scala-sttp4/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ src/main/scala/org/openapitools/client/api/PetApi.scala
77
src/main/scala/org/openapitools/client/api/StoreApi.scala
88
src/main/scala/org/openapitools/client/api/UserApi.scala
99
src/main/scala/org/openapitools/client/core/AdditionalTypeSerializers.scala
10+
src/main/scala/org/openapitools/client/core/DateSerializers.scala
1011
src/main/scala/org/openapitools/client/core/JsonSupport.scala
1112
src/main/scala/org/openapitools/client/model/ApiResponse.scala
1213
src/main/scala/org/openapitools/client/model/Category.scala

0 commit comments

Comments
 (0)