Skip to content

New Generator: Scala akka-http server #5758

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 21 commits into from
Apr 4, 2020
Merged

New Generator: Scala akka-http server #5758

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3bca919
Scala akka-http server base implementation
Mar 28, 2020
2c5230b
[scala-akka-http-server] petStore samples
Mar 28, 2020
c6ee7be
Improved the formatting of generated files
Mar 30, 2020
0e4bf2e
Updated scala-akka-http server samples
Mar 30, 2020
e5aa9f9
[scala-akka-http-server] the groupId, artifactId and artifactVersion …
Mar 30, 2020
1dcf064
Fixed the default operation not being correctly generated on paramete…
Mar 30, 2020
d5f6028
Added build.sbt.mustache supporting file
Mar 30, 2020
e1c7a43
Updated scala-akka-http server samples
Mar 30, 2020
6733574
ScalaAkkaHttpServer: Fixed a String.format call to use Locale.ROOT fo…
Mar 30, 2020
1c513da
[scala-akka-http-server] Fixed defaultValue being escaped during gene…
Mar 30, 2020
dde69cb
Added scala-akka-http.md
Mar 30, 2020
5f980e7
Replaced all "⇒" character with "=>" to retain compatibility with sca…
Mar 31, 2020
de57a5d
[scala-akka-http] Added a config option akkaHttpVersion
Mar 31, 2020
e31ab24
Updated scala-akka-http server samples
Mar 31, 2020
e89e9af
Merge branch 'master' into scala-akka-http-server
Mar 31, 2020
759370b
[scala-akka-http] More accurate akkaHttpVersion parsing
Mar 31, 2020
0e50337
Updated scala-akka-http.md
Mar 31, 2020
a1742a3
Merge branch 'master' into scala-akka-http-server
Apr 2, 2020
b3b769a
[scala-akka-http] Changed the akka-http version check to fix the gene…
Apr 3, 2020
95bdbb8
Updated scala-akka-http samples
Apr 3, 2020
b86fdba
updated scala-akka-http.md
Apr 3, 2020
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
Prev Previous commit
Next Next commit
Improved the formatting of generated files
  • Loading branch information
Olivier Leonard
Olivier Leonard committed Mar 30, 2020
commit c6ee7be6047bb694a5837dfbebb998b71ca81d30
18 changes: 8 additions & 10 deletions modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import akka.http.scaladsl.server.directives.FileInfo
{{/hasMultipart}}




{{#operations}}
class {{classname}}(
{{classVarName}}Service: {{classname}}Service{{#hasMarshalling}},
Expand All @@ -41,14 +39,14 @@ class {{classname}}(
lazy val route: Route =
{{#operation}}
path({{#vendorExtensions.paths}}{{#isText}}"{{/isText}}{{value}}{{#isText}}"{{/isText}}{{#hasMore}} / {{/hasMore}}{{/vendorExtensions.paths}}) { {{^pathParams.isEmpty}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) => {{/pathParams.isEmpty}}
{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}} {
{{^queryParams.isEmpty}}parameters({{#queryParams}}"{{baseName}}".as[{{dataType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}) { ({{#queryParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}) =>{{/queryParams.isEmpty}}
{{#headerParams}}{{#required}}headerValueByName{{/required}}{{^required}}optionalHeaderValueByName{{/required}}("{{baseName}}") { {{paramName}} => {{/headerParams}}
{{^cookieParams.isEmpty}}{{#cookieParams}}{{#required}}cookie({{/required}}{{^required}}optionalCookie({{/required}}"{{baseName}}"){ {{paramName}} => {{/cookieParams}}{{/cookieParams.isEmpty}}
{{#isMultipart}}{{> multipart}}{{/isMultipart}}{{^isMultipart}}{{> noMultipart}}{{/isMultipart}}
{{^cookieParams.isEmpty}} }{{/cookieParams.isEmpty}}
{{#headerParams}} }{{/headerParams}}
{{^queryParams.isEmpty}} }{{/queryParams.isEmpty}}
{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}} { {{^queryParams.isEmpty}}
parameters({{#queryParams}}"{{baseName}}".as[{{dataType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}) { ({{#queryParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/queryParams}}) =>{{/queryParams.isEmpty}} {{^headerParams.isEmpty}}
{{#headerParams}}{{#required}}headerValueByName{{/required}}{{^required}}optionalHeaderValueByName{{/required}}("{{baseName}}") { {{paramName}} => {{/headerParams}}{{/headerParams.isEmpty}}{{^cookieParams.isEmpty}}
{{#cookieParams}}{{#required}}cookie({{/required}}{{^required}}optionalCookie({{/required}}"{{baseName}}"){ {{paramName}} => {{/cookieParams}}{{/cookieParams.isEmpty}}{{#isMultipart}}
{{> multipart}}{{/isMultipart}}{{^isMultipart}}{{> noMultipart}}{{/isMultipart}}{{^cookieParams.isEmpty}}
}{{/cookieParams.isEmpty}}{{^headerParams.isEmpty}}
}{{/headerParams.isEmpty}}{{^queryParams.isEmpty}}
}{{/queryParams.isEmpty}}
}
}{{^-last}} ~{{/-last}}
{{/operation}}
Expand Down
20 changes: 9 additions & 11 deletions modules/openapi-generator/src/main/resources/scala-akka-http-server/multipart.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
formAndFiles({{#vendorExtensions.fileParams}}FileField("{{baseName}}")){{/vendorExtensions.fileParams}}{{#hasMore}}, {{/hasMore}} { partsAndFiles =>
{{^vendorExtensions.fileParams.isEmpty}}val _____ : Try[Route] = for {
formAndFiles({{#vendorExtensions.fileParams}}FileField("{{baseName}}")){{/vendorExtensions.fileParams}}{{#hasMore}}, {{/hasMore}} { partsAndFiles => {{^vendorExtensions.fileParams.isEmpty}}
val _____ : Try[Route] = for {
{{#vendorExtensions.fileParams}}{{baseName}} <- optToTry(partsAndFiles.files.get("{{baseName}}"), s"File {{baseName}} missing")
{{/vendorExtensions.fileParams}}
} yield { {{/vendorExtensions.fileParams.isEmpty}}
implicit val vp: StringValueProvider = partsAndFiles.form
{{^vendorExtensions.nonFileParams.isEmpty}}stringFields({{#vendorExtensions.nonFileParams}}"{{baseName}}".as[{{dataType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.nonFileParams}}) { ({{#vendorExtensions.nonFileParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.nonFileParams}}) =>{{/vendorExtensions.nonFileParams.isEmpty}}
{{classVarName}}Service.{{operationId}}({{#allParams}}{{paramName}} = {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
{{^vendorExtensions.nonFileFormParams.isEmpty}} }{{/vendorExtensions.nonFileFormParams.isEmpty}}
{{^vendorExtensions.fileParams.isEmpty}} }
_____.fold[Route](t => reject(MalformedRequestContentRejection("Missing file.", t)), identity)
{{/vendorExtensions.fileParams.isEmpty}}
}

implicit val vp: StringValueProvider = partsAndFiles.form{{^vendorExtensions.nonFileParams.isEmpty}}
stringFields({{#vendorExtensions.nonFileParams}}"{{baseName}}".as[{{dataType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.nonFileParams}}) { ({{#vendorExtensions.nonFileParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.nonFileParams}}) =>{{/vendorExtensions.nonFileParams.isEmpty}}
{{classVarName}}Service.{{operationId}}({{#allParams}}{{paramName}} = {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{^vendorExtensions.nonFileFormParams.isEmpty}}
}{{/vendorExtensions.nonFileFormParams.isEmpty}}{{^vendorExtensions.fileParams.isEmpty}}
}
_____.fold[Route](t => reject(MalformedRequestContentRejection("Missing file.", t)), identity){{/vendorExtensions.fileParams.isEmpty}}
}
12 changes: 7 additions & 5 deletions modules/openapi-generator/src/main/resources/scala-akka-http-server/noMultipart.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{{^formParams.isEmpty}}formFields({{#formParams}}"{{baseName}}".as[{{#isPrimitiveType}}{{dataType}}{{/isPrimitiveType}}{{^isPrimitiveType}}String{{/isPrimitiveType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/formParams}}) { ({{#formParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/formParams}}) =>{{/formParams.isEmpty}}
{{#bodyParam}}{{^isPrimitiveType}}entity(as[{{dataType}}]){ {{paramName}} =>{{/isPrimitiveType}}{{/bodyParam}}
{{classVarName}}Service.{{operationId}}({{#allParams}}{{paramName}} = {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
{{#bodyParam}}{{^isPrimitiveType}} }{{/isPrimitiveType}}{{/bodyParam}}
{{^formParams.isEmpty}} }{{/formParams.isEmpty}}
{{^formParams.isEmpty}}

formFields({{#formParams}}"{{baseName}}".as[{{#isPrimitiveType}}{{dataType}}{{/isPrimitiveType}}{{^isPrimitiveType}}String{{/isPrimitiveType}}]{{^required}}.?{{#vendorExtensions.hasDefaultValue}}({{defaultValue}}){{/vendorExtensions.hasDefaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/formParams}}) { ({{#formParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/formParams}}) =>{{/formParams.isEmpty}}
{{#bodyParam}}{{^isPrimitiveType}}entity(as[{{dataType}}]){ {{paramName}} =>
{{/isPrimitiveType}}{{/bodyParam}}{{classVarName}}Service.{{operationId}}({{#allParams}}{{paramName}} = {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#bodyParam}}{{^isPrimitiveType}}
}{{/isPrimitiveType}}{{/bodyParam}}{{^formParams.isEmpty}}
}{{/formParams.isEmpty}}