Skip to content

Commit 2893023

Browse files
wing328Desel72
andauthored
Add scalafmt (plugin) to scala-akka client generator (#23299)
* Add scalafmt (plugin) to scala-akka client generator * update tests --------- Co-authored-by: Desel72 <pedroluiscolmenares722@gmail.com>
1 parent a08871f commit 2893023

9 files changed

Lines changed: 5439 additions & 3587 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ public void processOpts() {
179179
supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
180180
final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
181181
supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
182+
supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
183+
supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
182184
supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
183185
supportingFiles.add(new SupportingFile("serializers.mustache", invokerFolder, "Serializers.scala"));
184186
}
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")
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+
}

modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public void mainPackageTest() throws Exception {
473473
Generator gen = generator.opts(clientOptInput);
474474
List<File> files = gen.generate();
475475

476-
Assert.assertEquals(files.size(), 16);
476+
Assert.assertEquals(files.size(), 18);
477477

478478
TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/model/SomeObj.scala");
479479
TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/core/ApiSettings.scala");
@@ -511,7 +511,7 @@ public void overridePackagesTest() throws Exception {
511511
Generator gen = generator.opts(clientOptInput);
512512

513513
List<File> files = gen.generate();
514-
Assert.assertEquals(files.size(), 16);
514+
Assert.assertEquals(files.size(), 18);
515515

516516
TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/model/package/SomeObj.scala");
517517
TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/package/invoker/ApiSettings.scala");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.scalafmt.conf
12
README.md
23
build.sbt
34
docs/ApiResponse.md
@@ -10,6 +11,7 @@ docs/Tag.md
1011
docs/User.md
1112
docs/UserApi.md
1213
project/build.properties
14+
project/plugins.sbt
1315
src/main/resources/reference.conf
1416
src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
1517
src/main/scala/org/openapitools/client/api/PetApi.scala
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+
}
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")

website/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
},
1313
"devDependencies": {},
1414
"dependencies": {
15-
"@docusaurus/core": "^2.3.1",
16-
"@docusaurus/plugin-google-analytics": "^2.3.1",
17-
"@docusaurus/preset-classic": "^2.3.1",
18-
"@docusaurus/utils": "^2.3.1",
15+
"@docusaurus/core": "^3.9.2",
16+
"@docusaurus/plugin-google-analytics": "^3.9.2",
17+
"@docusaurus/preset-classic": "^3.9.2",
18+
"@docusaurus/utils": "^3.9.2",
1919
"classnames": "^2.2.6",
2020
"js-yaml": "^4.1.1",
2121
"lodash.merge": "^4.6.2",

0 commit comments

Comments
 (0)