From a67962e101a4c4a724ee9bdbb6cc5e0c7571d991 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 28 Feb 2019 06:07:36 +0100 Subject: [PATCH 01/10] Update swagger-parser to '2.0.10-SNAPSHOT' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0ba2f2f8b0d..e6c0734e9257 100644 --- a/pom.xml +++ b/pom.xml @@ -1364,7 +1364,7 @@ 1.8 1.8 org.openapitools.swagger.parser - 2.0.8-OpenAPITools.org-2 + 2.0.10-SNAPSHOT 2.0.6 2.11.1 3.3.1 From 072c83e755f587d20aa7fd26dc5dae0f6c95589f Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 28 Feb 2019 06:14:49 +0100 Subject: [PATCH 02/10] Add a TODO --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6c0734e9257..9348fd3de8c8 100644 --- a/pom.xml +++ b/pom.xml @@ -1364,7 +1364,7 @@ 1.8 1.8 org.openapitools.swagger.parser - 2.0.10-SNAPSHOT + 2.0.10-SNAPSHOT 2.0.6 2.11.1 3.3.1 From bc7b041bf1880fe6597222fc38d32a3d066e703c Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 28 Feb 2019 07:19:30 +0100 Subject: [PATCH 03/10] Update input spec --- modules/openapi-generator-maven-plugin/examples/swagger.yaml | 3 ++- .../src/test/resources/2_0/globalSecurity.json | 2 +- .../src/test/resources/2_0/long_description_issue_7839.json | 2 +- .../src/test/resources/2_0/petstore-bash.json | 2 +- .../src/test/resources/2_0/petstore-nullable.yaml | 3 ++- .../src/test/resources/2_0/petstore-orig.json | 2 +- .../src/test/resources/2_0/petstore-vendor-mime.yaml | 3 ++- .../2_0/petstore-with-fake-endpoints-models-for-testing.yaml | 3 ++- modules/openapi-generator/src/test/resources/2_0/petstore.yaml | 3 ++- .../src/test/resources/2_0/petstore_issue_7999.json | 2 +- .../petstore-with-fake-endpoints-models-for-testing.yaml | 3 ++- .../swift/petstore-with-fake-endpoints-models-for-testing.yaml | 3 ++- .../3_0/petstore-with-fake-endpoints-models-for-testing.yaml | 3 ++- modules/openapi-generator/src/test/resources/3_0/petstore.json | 2 +- modules/openapi-generator/src/test/resources/3_0/petstore.yaml | 3 ++- .../src/test/resources/3_0/petstore_oas3_test.yaml | 3 ++- .../resources/integrationtests/typescript/petstore-spec.json | 2 +- modules/openapi-generator/src/test/resources/petstore.json | 2 +- 18 files changed, 28 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator-maven-plugin/examples/swagger.yaml b/modules/openapi-generator-maven-plugin/examples/swagger.yaml index c6d37b257502..3dfb1d7d6855 100644 --- a/modules/openapi-generator-maven-plugin/examples/swagger.yaml +++ b/modules/openapi-generator-maven-plugin/examples/swagger.yaml @@ -110,7 +110,8 @@ paths: - "available" - "pending" - "sold" - default: "available" + default: + - "available" collectionFormat: "csv" responses: 200: 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/long_description_issue_7839.json b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json index 1aa831927f56..7d42bf22dd9b 100644 --- a/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json +++ b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json @@ -103,7 +103,7 @@ "items" : { "type" : "string", "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : ["available"] }, "collectionFormat" : "multi" } ], diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json index 3d06c94a2913..10b7224ea233 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json @@ -159,7 +159,7 @@ "pending", "sold" ], - "default":"available" + "default": ["available"] }, "collectionFormat":"multi" } diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml index f784c3e83f78..2fed033788db 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml @@ -97,7 +97,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': 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-vendor-mime.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml index 324e57a63485..c157b0d788dd 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml @@ -96,7 +96,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index 2de23983ffb3..31629b1209f6 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,7 +97,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml index 8308f7241582..5c24dee8e53c 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml @@ -97,7 +97,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': 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/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml index 18ccb6b5d760..2ba59d1baa09 100644 --- a/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,7 +97,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml index 2bc345dab4ed..94ceec8ab835 100644 --- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,7 +97,8 @@ paths: - available - pending - sold - default: available + default: + - available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml index 35335d5cdc3c..aad356daab85 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -89,7 +89,8 @@ paths: - available - pending - sold - default: available + default: + - available responses: '200': description: successful operation 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/3_0/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml index b931ddc0302e..7d1e7d62684e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml @@ -75,7 +75,8 @@ paths: - available - pending - sold - default: available + default: + - available responses: '200': description: successful operation diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml index b6abd5c6aac8..10548734c313 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml @@ -74,7 +74,8 @@ paths: - available - pending - sold - default: available + default: + - available responses: '200': description: successful operation diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json index 6f11c3c90129..167762532703 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json @@ -143,7 +143,7 @@ "pending", "sold" ], - "default": "available" + "default": ["available"] }, "collectionFormat": "csv" } 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": { From c3e3d64c91915178007975c8e35058e84712b4de Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 28 Feb 2019 10:55:42 +0100 Subject: [PATCH 04/10] Update input spec again --- modules/openapi-generator-maven-plugin/examples/swagger.yaml | 3 +-- .../src/test/resources/2_0/long_description_issue_7839.json | 2 +- .../src/test/resources/2_0/petstore-bash.json | 2 +- .../src/test/resources/2_0/petstore-nullable.yaml | 3 +-- .../src/test/resources/2_0/petstore-vendor-mime.yaml | 3 +-- .../2_0/petstore-with-fake-endpoints-models-for-testing.yaml | 3 +-- modules/openapi-generator/src/test/resources/2_0/petstore.yaml | 3 +-- .../petstore-with-fake-endpoints-models-for-testing.yaml | 3 +-- .../swift/petstore-with-fake-endpoints-models-for-testing.yaml | 3 +-- .../3_0/petstore-with-fake-endpoints-models-for-testing.yaml | 3 +-- modules/openapi-generator/src/test/resources/3_0/petstore.yaml | 3 +-- .../src/test/resources/3_0/petstore_oas3_test.yaml | 3 +-- .../resources/integrationtests/typescript/petstore-spec.json | 2 +- 13 files changed, 13 insertions(+), 23 deletions(-) diff --git a/modules/openapi-generator-maven-plugin/examples/swagger.yaml b/modules/openapi-generator-maven-plugin/examples/swagger.yaml index 3dfb1d7d6855..c6d37b257502 100644 --- a/modules/openapi-generator-maven-plugin/examples/swagger.yaml +++ b/modules/openapi-generator-maven-plugin/examples/swagger.yaml @@ -110,8 +110,7 @@ paths: - "available" - "pending" - "sold" - default: - - "available" + default: "available" collectionFormat: "csv" responses: 200: diff --git a/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json index 7d42bf22dd9b..1aa831927f56 100644 --- a/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json +++ b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json @@ -103,7 +103,7 @@ "items" : { "type" : "string", "enum" : [ "available", "pending", "sold" ], - "default" : ["available"] + "default" : "available" }, "collectionFormat" : "multi" } ], diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json index 10b7224ea233..3d06c94a2913 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json @@ -159,7 +159,7 @@ "pending", "sold" ], - "default": ["available"] + "default":"available" }, "collectionFormat":"multi" } diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml index 2fed033788db..f784c3e83f78 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml @@ -97,8 +97,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml index c157b0d788dd..324e57a63485 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml @@ -96,8 +96,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index 31629b1209f6..2de23983ffb3 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,8 +97,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml index 5c24dee8e53c..8308f7241582 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml @@ -97,8 +97,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml index 2ba59d1baa09..18ccb6b5d760 100644 --- a/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,8 +97,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml index 94ceec8ab835..2bc345dab4ed 100644 --- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml @@ -97,8 +97,7 @@ paths: - available - pending - sold - default: - - available + default: available collectionFormat: csv responses: '200': diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml index aad356daab85..35335d5cdc3c 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -89,8 +89,7 @@ paths: - available - pending - sold - default: - - available + default: available responses: '200': description: successful operation diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml index 7d1e7d62684e..b931ddc0302e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml @@ -75,8 +75,7 @@ paths: - available - pending - sold - default: - - available + default: available responses: '200': description: successful operation diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml index 10548734c313..b6abd5c6aac8 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml @@ -74,8 +74,7 @@ paths: - available - pending - sold - default: - - available + default: available responses: '200': description: successful operation diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json index 167762532703..6f11c3c90129 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json @@ -143,7 +143,7 @@ "pending", "sold" ], - "default": ["available"] + "default": "available" }, "collectionFormat": "csv" } From 40423666d05110767286a13cda4c7339d8dd0e97 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Fri, 1 Mar 2019 06:49:04 +0100 Subject: [PATCH 05/10] Update samples --- .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Name.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 ]; /** From 23d0def64f55efc9d84fc0f7cd6b3f608994c837 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 26 Mar 2019 07:01:16 +0100 Subject: [PATCH 06/10] Set version to 2.0.10-OpenAPITools.org-1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1c58179c9ba0..02a79a4ceabd 100644 --- a/pom.xml +++ b/pom.xml @@ -1362,8 +1362,8 @@ 1.8 1.8 org.openapitools.swagger.parser - 2.0.10-SNAPSHOT - 2.0.6 + 2.0.10-OpenAPITools.org-1 + 2.0.7 2.11.1 3.3.1 2.4 From e1cd28730f201b02253266663e2b669ab4774327 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 26 Mar 2019 15:06:27 +0100 Subject: [PATCH 07/10] Ensure up-to-date --- .../petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 2d46e676411350f57a3e4027e7aa147083b0d4e7 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 26 Mar 2019 17:55:43 +0100 Subject: [PATCH 08/10] Update to 2.0.11-OpenAPITools.org-1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c639ddb9ab6..17d8cdf923be 100644 --- a/pom.xml +++ b/pom.xml @@ -1369,7 +1369,7 @@ 1.8 1.8 org.openapitools.swagger.parser - 2.0.10-OpenAPITools.org-1 + 2.0.11-OpenAPITools.org-1 2.0.7 2.11.1 3.3.1 From cf53f056fab8b364e991cdb010cad258345f9a33 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 26 Mar 2019 22:12:30 +0100 Subject: [PATCH 09/10] Run bin/utils/export_docs_generators.sh --- docs/generators/scala-play-framework.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 docs/generators/scala-play-framework.md 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| From c46fb5eb96249f2dd99ef53935c7fbe64b38ee2e Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Wed, 27 Mar 2019 12:21:15 +0100 Subject: [PATCH 10/10] update dart-jaguar doc --- docs/generators/dart-jaguar.md | 63 ++++++++++++---------------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/docs/generators/dart-jaguar.md b/docs/generators/dart-jaguar.md index 1a56ec39ab17..90b3f191f485 100644 --- a/docs/generators/dart-jaguar.md +++ b/docs/generators/dart-jaguar.md @@ -1,43 +1,22 @@ -CONFIG OPTIONS for dart-jaguar - - sortParamsByRequiredFlag - Sort method arguments to place required parameters before optional parameters. (Default: true) - - ensureUniqueParams - Whether to ensure parameter names are unique in an operation (rename parameters that are not). (Default: true) - - allowUnicodeIdentifiers - boolean, toggles whether unicode identifiers are allowed in names or not, default is false (Default: false) - - prependFormOrBodyParameters - Add form or body parameters to the beginning of the parameter list. (Default: false) - - browserClient - Is the client browser based - - pubName - Name in generated pubspec - - pubVersion - Version in generated pubspec - - pubDescription - Description in generated pubspec - - useEnumExtension - Allow the 'x-enum-values' extension for enums - - sourceFolder - source folder for generated code - - supportDart2 - support dart2 (Default: true) - - nullableFields - Is the null fields should be in the JSON payload - - serialization - Choose serialization format JSON or PROTO is supported - -Back to the [generators list](README.md) +--- +id: generator-opts-client-dart-jaguar +title: Config Options for dart-jaguar +sidebar_label: dart-jaguar +--- + +| 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| +|browserClient|Is the client browser based| |null| +|pubName|Name in generated pubspec| |null| +|pubVersion|Version in generated pubspec| |null| +|pubDescription|Description in generated pubspec| |null| +|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null| +|sourceFolder|source folder for generated code| |null| +|supportDart2|support dart2| |true| +|nullableFields|Is the null fields should be in the JSON payload| |null| +|serialization|Choose serialization format JSON or PROTO is supported| |null|