diff --git a/docs/generators/scala-play-framework.md b/docs/generators/scala-play-framework.md new file mode 100644 index 000000000000..ff1f8243e176 --- /dev/null +++ b/docs/generators/scala-play-framework.md @@ -0,0 +1,22 @@ + +--- +id: generator-opts-server-scala-play-framework +title: Config Options for scala-play-framework +sidebar_label: scala-play-framework +--- + +| Option | Description | Values | Default | +| ------ | ----------- | ------ | ------- | +|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| +|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| +|modelPackage|package for generated models| |null| +|apiPackage|package for generated api classes| |null| +|sourceFolder|source folder for generated code| |null| +|routesFileName|Name of the routes file to generate.| |routes| +|routesFileName|Base package in which supporting classes are generated.| |org.openapitools| +|skipStubs|If set, skips generation of stub classes.| |false| +|supportAsync|If set, wraps API return types with Futures and generates async actions.| |false| +|generateCustomExceptions|If set, generates custom exception types.| |true| +|useSwaggerUI|Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies| |true| diff --git a/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json b/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json index c05b02a3f839..55b2e00df063 100644 --- a/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json +++ b/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json @@ -126,7 +126,7 @@ "type": "string" }, "collectionFormat": "multi", - "default": "available" + "default": ["available"] } ], "responses": { diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json b/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json index 17048fe41171..c1dea7c659fc 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json @@ -126,7 +126,7 @@ "type": "string" }, "collectionFormat": "multi", - "default": "available" + "default": ["available"] } ], "responses": { diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json b/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json index 4176ba3649fd..ef76c0d2c074 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json +++ b/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json @@ -127,7 +127,7 @@ "enum": ["available", "pending", "sold"] }, "collectionFormat": "multi", - "default": "available" + "default": ["available"] } ], "responses": { diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore.json b/modules/openapi-generator/src/test/resources/3_0/petstore.json index cb9a3aa58bd6..e776d0284daf 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore.json +++ b/modules/openapi-generator/src/test/resources/3_0/petstore.json @@ -96,7 +96,7 @@ "sold" ] }, - "default": "available" + "default": ["available"] } } ], diff --git a/modules/openapi-generator/src/test/resources/petstore.json b/modules/openapi-generator/src/test/resources/petstore.json index 155150dd6fa4..3f39cd50fad8 100644 --- a/modules/openapi-generator/src/test/resources/petstore.json +++ b/modules/openapi-generator/src/test/resources/petstore.json @@ -126,7 +126,7 @@ "type": "string" }, "collectionFormat": "multi", - "default": "available" + "default": ["available"] } ], "responses": { diff --git a/pom.xml b/pom.xml index 9c8d85911f20..4f881f3602fc 100644 --- a/pom.xml +++ b/pom.xml @@ -1370,8 +1370,8 @@ 1.8 1.8 org.openapitools.swagger.parser - 2.0.8-OpenAPITools.org-2 - 2.0.6 + 2.0.11-OpenAPITools.org-1 + 2.0.7 2.11.1 3.3.1 2.4 diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 240c381b078e..5d052f9a58ea 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -80,7 +80,7 @@ class FormatTest implements ModelInterface, ArrayAccess * @var string[] */ protected static $openAPIFormats = [ - 'integer' => 'int32', + 'integer' => null, 'int32' => 'int32', 'int64' => 'int64', 'number' => null, diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php index b6c4e18fbf33..06b99255fee8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php @@ -79,7 +79,7 @@ class InlineObject3 implements ModelInterface, ArrayAccess * @var string[] */ protected static $openAPIFormats = [ - 'integer' => 'int32', + 'integer' => null, 'int32' => 'int32', 'int64' => 'int64', 'number' => null, diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index 60e89ef0e5ce..9cee078858ca 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -73,7 +73,7 @@ class Name implements ModelInterface, ArrayAccess 'name' => 'int32', 'snake_case' => 'int32', 'property' => null, - '_123_number' => 'int32' + '_123_number' => null ]; /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index 2c7207b37aad..6331ffd7a372 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -77,7 +77,7 @@ class NullableClass implements ModelInterface, ArrayAccess * @var string[] */ protected static $openAPIFormats = [ - 'integer_prop' => 'int32', + 'integer_prop' => null, 'number_prop' => null, 'boolean_prop' => null, 'string_prop' => null,