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

[scala-akka-http-server] model default value when field is not required (#12068)

Browse Source 
* scala-akka-http-server model default value when field is not required

* scala-akka-http-server sample generate

* delete bin/configs/other/scala-akka-http-server.yaml
This commit is contained in:
jsoizo 2022-05-10 01:43:09 +09:00 committed by GitHub
parent e639dad66a
commit d242a98343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/configs/other/scala-akka-http-server.yaml → bin/configs/scala-akka-http-server.yaml
View File

@ -2,3 +2,5 @@ generatorName: scala-akka-http-server
outputDir: samples/server/petstore/scala-akka-http-server outputDir: samples/server/petstore/scala-akka-http-server
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server
additionalProperties:
artifactId: openapi-scala-akka-http-server

2
modules/openapi-generator/src/main/resources/scala-akka-http-server/api.mustache vendored
View File

@ -64,7 +64,7 @@ object {{classname}}Patterns {
trait {{classname}}Service { trait {{classname}}Service {
{{#operation}} {{#operation}}
{{#responses}} def {{operationId}}{{#vendorExtensions.x-is-default}}Default{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}{{#baseType}}({{#vendorExtensions.x-is-default}}statusCode: Int, {{/vendorExtensions.x-is-default}}response{{baseType}}{{containerType}}: {{dataType}}){{^isPrimitiveType}}(implicit toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]){{/isPrimitiveType}}{{/baseType}}{{^baseType}}{{#vendorExtensions.x-is-default}}(statusCode: Int){{/vendorExtensions.x-is-default}}{{/baseType}}: Route ={{#vendorExtensions.x-empty-response}} {{#responses}} def {{operationId}}{{#vendorExtensions.x-is-default}}Default{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}{{#baseType}}({{#vendorExtensions.x-is-default}}statusCode: Int, {{/vendorExtensions.x-is-default}}response{{baseType}}{{containerType}}: {{dataType}})(implicit toEntityMarshaller{{baseType}}{{containerType}}: ToEntityMarshaller[{{dataType}}]){{/baseType}}{{^baseType}}{{#vendorExtensions.x-is-default}}(statusCode: Int){{/vendorExtensions.x-is-default}}{{/baseType}}: Route ={{#vendorExtensions.x-empty-response}}
complete({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}StatusCodes.getForKey({{code}}){{/vendorExtensions.x-is-default}}){{/vendorExtensions.x-empty-response}}{{^vendorExtensions.x-empty-response}} complete({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}StatusCodes.getForKey({{code}}){{/vendorExtensions.x-is-default}}){{/vendorExtensions.x-empty-response}}{{^vendorExtensions.x-empty-response}}
complete(({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}, {{#baseType}}response{{baseType}}{{containerType}}{{/baseType}}{{^baseType}}"{{message}}"{{/baseType}})){{/vendorExtensions.x-empty-response}} complete(({{#vendorExtensions.x-is-default}}statusCode{{/vendorExtensions.x-is-default}}{{^vendorExtensions.x-is-default}}{{code}}{{/vendorExtensions.x-is-default}}, {{#baseType}}response{{baseType}}{{containerType}}{{/baseType}}{{^baseType}}"{{message}}"{{/baseType}})){{/vendorExtensions.x-empty-response}}
{{/responses}} {{/responses}}

2
modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache vendored
View File

@ -19,7 +19,7 @@ import {{import}}
*/ */
final case class {{classname}} ( final case class {{classname}} (
{{#vars}} {{#vars}}
{{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{^-last}},{{/-last}} {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{^-last}},{{/-last}}
{{/vars}} {{/vars}}
) )

2
samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION
View File

@ -1 +1 @@
5.3.0-SNAPSHOT 6.0.0-SNAPSHOT

1
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/api/UserApi.scala
View File

@ -7,6 +7,7 @@ import akka.http.scaladsl.marshalling.ToEntityMarshaller
import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller
import akka.http.scaladsl.unmarshalling.FromStringUnmarshaller import akka.http.scaladsl.unmarshalling.FromStringUnmarshaller
import org.openapitools.server.AkkaHttpHelper._ import org.openapitools.server.AkkaHttpHelper._
import java.time.OffsetDateTime
import org.openapitools.server.model.User import org.openapitools.server.model.User

6
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/ApiResponse.scala
View File

@ -11,8 +11,8 @@ package org.openapitools.server.model
* @param message for example: ''null'' * @param message for example: ''null''
*/ */
final case class ApiResponse ( final case class ApiResponse (
code: Option[Int], code: Option[Int] = None,
`type`: Option[String], `type`: Option[String] = None,
message: Option[String] message: Option[String] = None
) )

4
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Category.scala
View File

@ -10,7 +10,7 @@ package org.openapitools.server.model
* @param name for example: ''null'' * @param name for example: ''null''
*/ */
final case class Category ( final case class Category (
id: Option[Long], id: Option[Long] = None,
name: Option[String] name: Option[String] = None
) )

4
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject.scala
View File

@ -6,7 +6,7 @@ package org.openapitools.server.model
* @param status Updated status of the pet for example: ''null'' * @param status Updated status of the pet for example: ''null''
*/ */
final case class InlineObject ( final case class InlineObject (
name: Option[String], name: Option[String] = None,
status: Option[String] status: Option[String] = None
) )

4
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/InlineObject1.scala
View File

@ -7,7 +7,7 @@ import java.io.File
* @param file file to upload for example: ''null'' * @param file file to upload for example: ''null''
*/ */
final case class InlineObject1 ( final case class InlineObject1 (
additionalMetadata: Option[String], additionalMetadata: Option[String] = None,
file: Option[File] file: Option[File] = None
) )

12
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Order.scala
View File

@ -15,11 +15,11 @@ import java.time.OffsetDateTime
* @param complete for example: ''null'' * @param complete for example: ''null''
*/ */
final case class Order ( final case class Order (
id: Option[Long], id: Option[Long] = None,
petId: Option[Long], petId: Option[Long] = None,
quantity: Option[Int], quantity: Option[Int] = None,
shipDate: Option[OffsetDateTime], shipDate: Option[OffsetDateTime] = None,
status: Option[String], status: Option[String] = None,
complete: Option[Boolean] complete: Option[Boolean] = None
) )

8
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Pet.scala
View File

@ -14,11 +14,11 @@ package org.openapitools.server.model
* @param status pet status in the store for example: ''null'' * @param status pet status in the store for example: ''null''
*/ */
final case class Pet ( final case class Pet (
id: Option[Long], id: Option[Long] = None,
category: Option[Category], category: Option[Category] = None,
name: String, name: String,
photoUrls: Seq[String], photoUrls: Seq[String],
tags: Option[Seq[Tag]], tags: Option[Seq[Tag]] = None,
status: Option[String] status: Option[String] = None
) )

4
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/Tag.scala
View File

@ -10,7 +10,7 @@ package org.openapitools.server.model
* @param name for example: ''null'' * @param name for example: ''null''
*/ */
final case class Tag ( final case class Tag (
id: Option[Long], id: Option[Long] = None,
name: Option[String] name: Option[String] = None
) )

16
samples/server/petstore/scala-akka-http-server/src/main/scala/org/openapitools/server/model/User.scala
View File

@ -16,13 +16,13 @@ package org.openapitools.server.model
* @param userStatus User Status for example: ''null'' * @param userStatus User Status for example: ''null''
*/ */
final case class User ( final case class User (
id: Option[Long], id: Option[Long] = None,
username: Option[String], username: Option[String] = None,
firstName: Option[String], firstName: Option[String] = None,
lastName: Option[String], lastName: Option[String] = None,
email: Option[String], email: Option[String] = None,
password: Option[String], password: Option[String] = None,
phone: Option[String], phone: Option[String] = None,
userStatus: Option[Int] userStatus: Option[Int] = None
) )