Skip to content

Add scalafmt (plugin) to scala-akka client generator #23299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Mar 20, 2026
Merged

Add scalafmt (plugin) to scala-akka client generator #23299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6171846
Add scalafmt (plugin) to scala-akka client generator
Desel72 Mar 19, 2026
7b8a829
update tests
wing328 Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...pi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ public void processOpts() {
supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
supportingFiles.add(new SupportingFile("serializers.mustache", invokerFolder, "Serializers.scala"));
}
Expand Down
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/scala-akka-client/project/plugins.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
58 changes: 58 additions & 0 deletions modules/openapi-generator/src/main/resources/scala-akka-client/scalafmt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
version=3.10.6
runner.dialect = scala213
project {
git = false
excludeFilters = [
scalafmt-benchmarks/src/resources,
sbt-test
bin/issue
]
layout = StandardConvention
}
align {
preset = none
stripMargin = true
}
binPack {
importSelectors = fold
}
newlines {
avoidForSimpleOverflow = all
ignoreInSyntax = false
source = fold
}
rewrite {
rules = [
AvoidInfix,
Imports,
RedundantBraces,
RedundantParens,
SortModifiers,
]
imports {
selectors = fold
removeRedundantSelectors = true
sort = ascii
groups = [
["org\\.scalafmt\\..*"],
["scala\\.meta\\..*", "org\\.scalameta\\..*"],
["sbt\\..*"],
["java.?\\..*"],
["scala\\..*"],
["org\\..*"],
["com\\..*"],
]
}
redundantBraces {
preset = all
oneStatApply {
parensMaxSpan = 300
bracesMinSpan = 300
}
}
redundantParens {
preset = all
}
sortModifiers.preset = styleGuide
trailingCommas.style = "always"
}
4 changes: 2 additions & 2 deletions ...enerator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public void mainPackageTest() throws Exception {
Generator gen = generator.opts(clientOptInput);
List<File> files = gen.generate();

Assert.assertEquals(files.size(), 16);
Assert.assertEquals(files.size(), 18);

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

List<File> files = gen.generate();
Assert.assertEquals(files.size(), 16);
Assert.assertEquals(files.size(), 18);

TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/model/package/SomeObj.scala");
TestUtils.ensureContainsFile(files, output, "src/main/scala/hello/world/package/invoker/ApiSettings.scala");
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/scala-akka/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.scalafmt.conf
README.md
build.sbt
docs/ApiResponse.md
Expand All @@ -10,6 +11,7 @@ docs/Tag.md
docs/User.md
docs/UserApi.md
project/build.properties
project/plugins.sbt
src/main/resources/reference.conf
src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
src/main/scala/org/openapitools/client/api/PetApi.scala
Expand Down
58 changes: 58 additions & 0 deletions samples/client/petstore/scala-akka/.scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
version=3.10.6
runner.dialect = scala213
project {
git = false
excludeFilters = [
scalafmt-benchmarks/src/resources,
sbt-test
bin/issue
]
layout = StandardConvention
}
align {
preset = none
stripMargin = true
}
binPack {
importSelectors = fold
}
newlines {
avoidForSimpleOverflow = all
ignoreInSyntax = false
source = fold
}
rewrite {
rules = [
AvoidInfix,
Imports,
RedundantBraces,
RedundantParens,
SortModifiers,
]
imports {
selectors = fold
removeRedundantSelectors = true
sort = ascii
groups = [
["org\\.scalafmt\\..*"],
["scala\\.meta\\..*", "org\\.scalameta\\..*"],
["sbt\\..*"],
["java.?\\..*"],
["scala\\..*"],
["org\\..*"],
["com\\..*"],
]
}
redundantBraces {
preset = all
oneStatApply {
parensMaxSpan = 300
bracesMinSpan = 300
}
}
redundantParens {
preset = all
}
sortModifiers.preset = styleGuide
trailingCommas.style = "always"
}
1 change: 1 addition & 0 deletions samples/client/petstore/scala-akka/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
8 changes: 4 additions & 4 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"devDependencies": {},
"dependencies": {
"@docusaurus/core": "^2.3.1",
"@docusaurus/plugin-google-analytics": "^2.3.1",
"@docusaurus/preset-classic": "^2.3.1",
"@docusaurus/utils": "^2.3.1",
"@docusaurus/core": "^3.9.2",
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai Bot Mar 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: Upgrading to Docusaurus v3 without also upgrading React/ReactDOM and prism-react-renderer introduces dependency incompatibilities that can break install/build.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At website/package.json, line 15:

<comment>Upgrading to Docusaurus v3 without also upgrading React/ReactDOM and prism-react-renderer introduces dependency incompatibilities that can break install/build.</comment>

<file context>
@@ -12,10 +12,10 @@
-    "@docusaurus/plugin-google-analytics": "^2.3.1",
-    "@docusaurus/preset-classic": "^2.3.1",
-    "@docusaurus/utils": "^2.3.1",
+    "@docusaurus/core": "^3.9.2",
+    "@docusaurus/plugin-google-analytics": "^3.9.2",
+    "@docusaurus/preset-classic": "^3.9.2",
</file context>
Fix with Cubic

"@docusaurus/plugin-google-analytics": "^3.9.2",
"@docusaurus/preset-classic": "^3.9.2",
"@docusaurus/utils": "^3.9.2",
"classnames": "^2.2.6",
"js-yaml": "^4.1.1",
"lodash.merge": "^4.6.2",
Expand Down
Loading
Loading