diff --git a/samples/client/petstore/apex/docs/SwagPetApi.md b/samples/client/petstore/apex/docs/SwagPetApi.md index 0911fbd0fa8..cb6ca928adb 100644 --- a/samples/client/petstore/apex/docs/SwagPetApi.md +++ b/samples/client/petstore/apex/docs/SwagPetApi.md @@ -47,7 +47,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SwagPet**](Pet.md)| Pet object that needs to be added to the store | + **body** | [**SwagPet**](SwagPet.md)| Pet object that needs to be added to the store | ### Return type @@ -292,7 +292,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SwagPet**](Pet.md)| Pet object that needs to be added to the store | + **body** | [**SwagPet**](SwagPet.md)| Pet object that needs to be added to the store | ### Return type diff --git a/samples/client/petstore/apex/docs/SwagStoreApi.md b/samples/client/petstore/apex/docs/SwagStoreApi.md index c0212e0300f..c18a1ac229c 100644 --- a/samples/client/petstore/apex/docs/SwagStoreApi.md +++ b/samples/client/petstore/apex/docs/SwagStoreApi.md @@ -168,7 +168,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SwagOrder**](Order.md)| order placed for purchasing the pet | + **body** | [**SwagOrder**](SwagOrder.md)| order placed for purchasing the pet | ### Return type diff --git a/samples/client/petstore/apex/docs/SwagUserApi.md b/samples/client/petstore/apex/docs/SwagUserApi.md index aa559ddeac2..349791c0665 100644 --- a/samples/client/petstore/apex/docs/SwagUserApi.md +++ b/samples/client/petstore/apex/docs/SwagUserApi.md @@ -42,7 +42,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SwagUser**](User.md)| Created user object | + **body** | [**SwagUser**](SwagUser.md)| Created user object | ### Return type @@ -342,7 +342,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **String**| name that need to be deleted | - **body** | [**SwagUser**](User.md)| Updated user object | + **body** | [**SwagUser**](SwagUser.md)| Updated user object | ### Return type diff --git a/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md b/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md index 41bddd87b49..3afd0a685ba 100644 --- a/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md +++ b/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md @@ -344,7 +344,7 @@ namespace Example var number = 3.4; // decimal? | None var _double = 1.2; // double? | None var patternWithoutDelimiter = patternWithoutDelimiter_example; // string | None - var _byte = B; // byte[] | None + var _byte = _byte_example; // byte[] | None var integer = 56; // int? | None (optional) var int32 = 56; // int? | None (optional) var int64 = 789; // long? | None (optional) diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs index c91ee20661d..2bf7d5997d2 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs @@ -418,6 +418,13 @@ public override int GetHashCode() yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of /[a-z]/i.", new [] { "_String" }); } + // _Byte (byte[]) pattern + Regex regex_Byte = new Regex(@"^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$", RegexOptions.CultureInvariant); + if (false == regex_Byte.Match(this._Byte).Success) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _Byte, must match a pattern of /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.", new [] { "_Byte" }); + } + // Password (string) maxLength if(this.Password != null && this.Password.Length > 64) { diff --git a/samples/client/petstore/csharp/SwaggerClientNetCoreProject/docs/FakeApi.md b/samples/client/petstore/csharp/SwaggerClientNetCoreProject/docs/FakeApi.md index 41bddd87b49..3afd0a685ba 100644 --- a/samples/client/petstore/csharp/SwaggerClientNetCoreProject/docs/FakeApi.md +++ b/samples/client/petstore/csharp/SwaggerClientNetCoreProject/docs/FakeApi.md @@ -344,7 +344,7 @@ namespace Example var number = 3.4; // decimal? | None var _double = 1.2; // double? | None var patternWithoutDelimiter = patternWithoutDelimiter_example; // string | None - var _byte = B; // byte[] | None + var _byte = _byte_example; // byte[] | None var integer = 56; // int? | None (optional) var int32 = 56; // int? | None (optional) var int64 = 789; // long? | None (optional) diff --git a/samples/client/petstore/csharp/SwaggerClientNetStandard/docs/FakeApi.md b/samples/client/petstore/csharp/SwaggerClientNetStandard/docs/FakeApi.md index 41bddd87b49..3afd0a685ba 100644 --- a/samples/client/petstore/csharp/SwaggerClientNetStandard/docs/FakeApi.md +++ b/samples/client/petstore/csharp/SwaggerClientNetStandard/docs/FakeApi.md @@ -344,7 +344,7 @@ namespace Example var number = 3.4; // decimal? | None var _double = 1.2; // double? | None var patternWithoutDelimiter = patternWithoutDelimiter_example; // string | None - var _byte = B; // byte[] | None + var _byte = _byte_example; // byte[] | None var integer = 56; // int? | None (optional) var int32 = 56; // int? | None (optional) var int64 = 789; // long? | None (optional) diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/docs/FakeApi.md b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/docs/FakeApi.md index 41bddd87b49..3afd0a685ba 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/docs/FakeApi.md +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/docs/FakeApi.md @@ -344,7 +344,7 @@ namespace Example var number = 3.4; // decimal? | None var _double = 1.2; // double? | None var patternWithoutDelimiter = patternWithoutDelimiter_example; // string | None - var _byte = B; // byte[] | None + var _byte = _byte_example; // byte[] | None var integer = 56; // int? | None (optional) var int32 = 56; // int? | None (optional) var int64 = 789; // long? | None (optional) diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs index 3f7e31a0d39..8762cbe9751 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs @@ -441,6 +441,13 @@ public virtual void OnPropertyChanged(string propertyName) yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of /[a-z]/i.", new [] { "_String" }); } + // _Byte (byte[]) pattern + Regex regex_Byte = new Regex(@"^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$", RegexOptions.CultureInvariant); + if (false == regex_Byte.Match(this._Byte).Success) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _Byte, must match a pattern of /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.", new [] { "_Byte" }); + } + // Password (string) maxLength if(this.Password != null && this.Password.Length > 64) { diff --git a/samples/client/petstore/objc/core-data/README.md b/samples/client/petstore/objc/core-data/README.md index 7ffa53d7cd8..aca3b5b6e33 100644 --- a/samples/client/petstore/objc/core-data/README.md +++ b/samples/client/petstore/objc/core-data/README.md @@ -69,7 +69,7 @@ SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig]; [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"]; -SWGPet* *body = [[Pet alloc] init]; // Pet object that needs to be added to the store (optional) +SWGPet* *body = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional) SWGPetApi *apiInstance = [[SWGPetApi alloc] init]; diff --git a/samples/client/petstore/objc/default/README.md b/samples/client/petstore/objc/default/README.md index 7ffa53d7cd8..aca3b5b6e33 100644 --- a/samples/client/petstore/objc/default/README.md +++ b/samples/client/petstore/objc/default/README.md @@ -69,7 +69,7 @@ SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig]; [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"]; -SWGPet* *body = [[Pet alloc] init]; // Pet object that needs to be added to the store (optional) +SWGPet* *body = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional) SWGPetApi *apiInstance = [[SWGPetApi alloc] init]; diff --git a/samples/client/petstore/objc/default/docs/SWGPetApi.md b/samples/client/petstore/objc/default/docs/SWGPetApi.md index 655141ba4c1..8740be886b3 100644 --- a/samples/client/petstore/objc/default/docs/SWGPetApi.md +++ b/samples/client/petstore/objc/default/docs/SWGPetApi.md @@ -32,7 +32,7 @@ SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig]; [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"]; -SWGPet* body = [[Pet alloc] init]; // Pet object that needs to be added to the store (optional) +SWGPet* body = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional) SWGPetApi*apiInstance = [[SWGPetApi alloc] init]; @@ -49,7 +49,7 @@ SWGPetApi*apiInstance = [[SWGPetApi alloc] init]; Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SWGPet***](Pet.md)| Pet object that needs to be added to the store | [optional] + **body** | [**SWGPet***](SWGPet.md)| Pet object that needs to be added to the store | [optional] ### Return type @@ -310,7 +310,7 @@ SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig]; [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"]; -SWGPet* body = [[Pet alloc] init]; // Pet object that needs to be added to the store (optional) +SWGPet* body = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional) SWGPetApi*apiInstance = [[SWGPetApi alloc] init]; @@ -327,7 +327,7 @@ SWGPetApi*apiInstance = [[SWGPetApi alloc] init]; Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SWGPet***](Pet.md)| Pet object that needs to be added to the store | [optional] + **body** | [**SWGPet***](SWGPet.md)| Pet object that needs to be added to the store | [optional] ### Return type diff --git a/samples/client/petstore/objc/default/docs/SWGStoreApi.md b/samples/client/petstore/objc/default/docs/SWGStoreApi.md index 4463984e0d7..2fc6c81ec75 100644 --- a/samples/client/petstore/objc/default/docs/SWGStoreApi.md +++ b/samples/client/petstore/objc/default/docs/SWGStoreApi.md @@ -173,7 +173,7 @@ Place an order for a pet ### Example ```objc -SWGOrder* body = [[Order alloc] init]; // order placed for purchasing the pet (optional) +SWGOrder* body = [[SWGOrder alloc] init]; // order placed for purchasing the pet (optional) SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init]; @@ -193,7 +193,7 @@ SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init]; Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SWGOrder***](Order.md)| order placed for purchasing the pet | [optional] + **body** | [**SWGOrder***](SWGOrder.md)| order placed for purchasing the pet | [optional] ### Return type diff --git a/samples/client/petstore/objc/default/docs/SWGUserApi.md b/samples/client/petstore/objc/default/docs/SWGUserApi.md index 618aa14b814..108f6b6aa54 100644 --- a/samples/client/petstore/objc/default/docs/SWGUserApi.md +++ b/samples/client/petstore/objc/default/docs/SWGUserApi.md @@ -27,7 +27,7 @@ This can only be done by the logged in user. ### Example ```objc -SWGUser* body = [[User alloc] init]; // Created user object (optional) +SWGUser* body = [[SWGUser alloc] init]; // Created user object (optional) SWGUserApi*apiInstance = [[SWGUserApi alloc] init]; @@ -44,7 +44,7 @@ SWGUserApi*apiInstance = [[SWGUserApi alloc] init]; Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | [**SWGUser***](User.md)| Created user object | [optional] + **body** | [**SWGUser***](SWGUser.md)| Created user object | [optional] ### Return type @@ -364,7 +364,7 @@ This can only be done by the logged in user. ```objc NSString* username = @"username_example"; // name that need to be deleted -SWGUser* body = [[User alloc] init]; // Updated user object (optional) +SWGUser* body = [[SWGUser alloc] init]; // Updated user object (optional) SWGUserApi*apiInstance = [[SWGUserApi alloc] init]; @@ -383,7 +383,7 @@ SWGUserApi*apiInstance = [[SWGUserApi alloc] init]; Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **NSString***| name that need to be deleted | - **body** | [**SWGUser***](User.md)| Updated user object | [optional] + **body** | [**SWGUser***](SWGUser.md)| Updated user object | [optional] ### Return type diff --git a/samples/client/petstore/perl/docs/FakeApi.md b/samples/client/petstore/perl/docs/FakeApi.md index f16c4d27f7a..30993d3eb41 100644 --- a/samples/client/petstore/perl/docs/FakeApi.md +++ b/samples/client/petstore/perl/docs/FakeApi.md @@ -269,7 +269,7 @@ my $api_instance = WWW::SwaggerClient::FakeApi->new(); my $number = 3.4; # Number | None my $double = 1.2; # double | None my $pattern_without_delimiter = 'pattern_without_delimiter_example'; # string | None -my $byte = 'B'; # string | None +my $byte = 'byte_example'; # string | None my $integer = 56; # int | None my $int32 = 56; # int | None my $int64 = 789; # int | None diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md index 08fb21b07ea..cb9a96613a6 100644 --- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md +++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md @@ -258,7 +258,7 @@ $api_instance = new Swagger\Client\Api\FakeApi(); $number = 3.4; // float | None $double = 1.2; // double | None $pattern_without_delimiter = "pattern_without_delimiter_example"; // string | None -$byte = "B"; // string | None +$byte = "byte_example"; // string | None $integer = 56; // int | None $int32 = 56; // int | None $int64 = 789; // int | None diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php index 916adfe43c2..c272f1f1624 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php @@ -528,8 +528,8 @@ public function testEndpointParametersWithHttpInfo($number, $double, $pattern_wi if ($pattern_without_delimiter === null) { throw new \InvalidArgumentException('Missing the required parameter $pattern_without_delimiter when calling testEndpointParameters'); } - if (!preg_match("/^[A-Z].*_/", $pattern_without_delimiter)) { - throw new \InvalidArgumentException("invalid value for \"pattern_without_delimiter\" when calling FakeApi.testEndpointParameters, must conform to the pattern /^[A-Z].*_/."); + if (!preg_match("/^[A-Z].*/", $pattern_without_delimiter)) { + throw new \InvalidArgumentException("invalid value for \"pattern_without_delimiter\" when calling FakeApi.testEndpointParameters, must conform to the pattern /^[A-Z].*/."); } // verify the required parameter 'byte' is set diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php index 31ca7fbf138..0a190d6497d 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php @@ -266,6 +266,10 @@ public function listInvalidProperties() if ($this->container['byte'] === null) { $invalid_properties[] = "'byte' can't be null"; } + if (!preg_match("/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/", $this->container['byte'])) { + $invalid_properties[] = "invalid value for 'byte', must be conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/."; + } + if ($this->container['date'] === null) { $invalid_properties[] = "'date' can't be null"; } @@ -331,6 +335,9 @@ public function valid() if ($this->container['byte'] === null) { return false; } + if (!preg_match("/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/", $this->container['byte'])) { + return false; + } if ($this->container['date'] === null) { return false; } @@ -555,6 +562,11 @@ public function getByte() */ public function setByte($byte) { + + if ((!preg_match("/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/", $byte))) { + throw new \InvalidArgumentException("invalid value for $byte when calling FormatTest., must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/."); + } + $this->container['byte'] = $byte; return $this; diff --git a/samples/client/petstore/powershell_test/README.md b/samples/client/petstore/powershell_test/README.md index eed57643045..48336547208 100644 --- a/samples/client/petstore/powershell_test/README.md +++ b/samples/client/petstore/powershell_test/README.md @@ -6,7 +6,7 @@ This PowerShell module is automatically generated by the [Swagger Codegen](https - API version: 1.0.0 - SDK version: -- Build date: 2017-06-20T22:49:00.415+08:00 +- Build date: 2017-07-06T21:28:56.389+02:00 - Build package: io.swagger.codegen.languages.PowerShellClientCodegen diff --git a/samples/client/petstore/powershell_test/src/IO.Swagger/en-US/about_IO.Swagger.help.txt b/samples/client/petstore/powershell_test/src/IO.Swagger/en-US/about_IO.Swagger.help.txt index d598279543b..cf553747c48 100644 --- a/samples/client/petstore/powershell_test/src/IO.Swagger/en-US/about_IO.Swagger.help.txt +++ b/samples/client/petstore/powershell_test/src/IO.Swagger/en-US/about_IO.Swagger.help.txt @@ -11,7 +11,7 @@ LONG DESCRIPTION - API version: 1.0.0 - SDK version: - - Build date: 2017-06-20T22:49:00.415+08:00 + - Build date: 2017-07-06T21:28:56.389+02:00 - Build package: io.swagger.codegen.languages.PowerShellClientCodegen Frameworks supported: diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md index d27831bc178..b89dd94b7ab 100644 --- a/samples/client/petstore/python/docs/FakeApi.md +++ b/samples/client/petstore/python/docs/FakeApi.md @@ -273,7 +273,7 @@ api_instance = petstore_api.FakeApi() number = 3.4 # float | None double = 1.2 # float | None pattern_without_delimiter = 'pattern_without_delimiter_example' # str | None -byte = 'B' # str | None +byte = 'byte_example' # str | None integer = 56 # int | None (optional) int32 = 56 # int | None (optional) int64 = 789 # int | None (optional) diff --git a/samples/client/petstore/python/petstore_api/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py index b5afc2e4815..3a6f07ea254 100644 --- a/samples/client/petstore/python/petstore_api/models/format_test.py +++ b/samples/client/petstore/python/petstore_api/models/format_test.py @@ -295,6 +295,8 @@ def byte(self, byte): """ if byte is None: raise ValueError("Invalid value for `byte`, must not be `None`") + if byte is not None and not re.search('^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$', byte): + raise ValueError("Invalid value for `byte`, must be a follow pattern or equal to `/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/`") self._byte = byte diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift index ccfe530cde0..c061bb819fb 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift @@ -168,9 +168,9 @@ open class FakeAPI: APIBase { To test \"client\" model - PATCH /fake - To test \"client\" model - - examples: [{example={ + - examples: [{contentType=application/json, example={ "client" : "aeiou" -}, contentType=application/json}] +}}] - parameter body: (body) client model diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift index 6f568002ac5..ddb79ca09ee 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift @@ -123,7 +123,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -132,21 +132,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -155,20 +155,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter status: (query) Status values that need to be considered for filter @@ -210,7 +210,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -219,21 +219,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -242,20 +242,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter tags: (query) Tags to filter by @@ -297,7 +297,7 @@ open class PetAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -306,21 +306,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -329,20 +329,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] - parameter petId: (path) ID of pet to return @@ -471,11 +471,11 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example={ - "message" : "aeiou", + - examples: [{contentType=application/json, example={ "code" : 0, - "type" : "aeiou" -}, contentType=application/json}] + "type" : "aeiou", + "message" : "aeiou" +}}] - parameter petId: (path) ID of pet to update - parameter additionalMetadata: (form) Additional data to pass to server (optional) diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift index 9ebae157352..9ad185d9c0a 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift @@ -66,9 +66,9 @@ open class StoreAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example={ + - examples: [{contentType=application/json, example={ "key" : 0 -}, contentType=application/json}] +}}] - returns: RequestBuilder<[String:Int32]> */ @@ -102,36 +102,36 @@ open class StoreAPI: APIBase { Find purchase order by ID - GET /store/order/{order_id} - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter orderId: (path) ID of pet that needs to be fetched @@ -168,36 +168,36 @@ open class StoreAPI: APIBase { Place an order for a pet - POST /store/order - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter body: (body) order placed for purchasing the pet diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift index 3b7d33cf4d5..5f5d7754609 100644 --- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift +++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift @@ -169,7 +169,7 @@ open class UserAPI: APIBase { Get user by user name - GET /user/{username} - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -178,17 +178,17 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] - - examples: [{example= + "username" : "aeiou" +}}] + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -197,16 +197,16 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] + "username" : "aeiou" +}}] - parameter username: (path) The name that needs to be fetched. Use user1 for testing. @@ -246,8 +246,8 @@ open class UserAPI: APIBase { - - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] - parameter username: (query) The user name for login - parameter password: (query) The password for login in clear text diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift index f8efdca4b93..26039262b26 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift @@ -250,9 +250,9 @@ open class FakeAPI: APIBase { To test \"client\" model - PATCH /fake - To test \"client\" model - - examples: [{example={ + - examples: [{contentType=application/json, example={ "client" : "aeiou" -}, contentType=application/json}] +}}] - parameter body: (body) client model diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift index e57f3ab4f71..cedd7e12c5a 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift @@ -176,7 +176,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -185,21 +185,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -208,20 +208,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter status: (query) Status values that need to be considered for filter @@ -280,7 +280,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -289,21 +289,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -312,20 +312,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter tags: (query) Tags to filter by @@ -384,7 +384,7 @@ open class PetAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -393,21 +393,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -416,20 +416,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] - parameter petId: (path) ID of pet to return @@ -613,11 +613,11 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example={ - "message" : "aeiou", + - examples: [{contentType=application/json, example={ "code" : 0, - "type" : "aeiou" -}, contentType=application/json}] + "type" : "aeiou", + "message" : "aeiou" +}}] - parameter petId: (path) ID of pet to update - parameter additionalMetadata: (form) Additional data to pass to server (optional) diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift index 00e8c27a292..abef290860d 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift @@ -100,9 +100,9 @@ open class StoreAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example={ + - examples: [{contentType=application/json, example={ "key" : 0 -}, contentType=application/json}] +}}] - returns: RequestBuilder<[String:Int32]> */ @@ -153,36 +153,36 @@ open class StoreAPI: APIBase { Find purchase order by ID - GET /store/order/{order_id} - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter orderId: (path) ID of pet that needs to be fetched @@ -236,36 +236,36 @@ open class StoreAPI: APIBase { Place an order for a pet - POST /store/order - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter body: (body) order placed for purchasing the pet diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift index 699700af175..2e7a5a2da0c 100644 --- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift +++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift @@ -255,7 +255,7 @@ open class UserAPI: APIBase { Get user by user name - GET /user/{username} - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -264,17 +264,17 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] - - examples: [{example= + "username" : "aeiou" +}}] + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -283,16 +283,16 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] + "username" : "aeiou" +}}] - parameter username: (path) The name that needs to be fetched. Use user1 for testing. @@ -350,8 +350,8 @@ open class UserAPI: APIBase { - - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] - parameter username: (query) The user name for login - parameter password: (query) The password for login in clear text diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift index 369f4d2c412..90cd6f01c97 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift @@ -260,9 +260,9 @@ open class FakeAPI: APIBase { To test \"client\" model - PATCH /fake - To test \"client\" model - - examples: [{example={ + - examples: [{contentType=application/json, example={ "client" : "aeiou" -}, contentType=application/json}] +}}] - parameter body: (body) client model diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift index ad3c9e596fa..3230b262b5c 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift @@ -182,7 +182,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -191,21 +191,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -214,20 +214,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter status: (query) Status values that need to be considered for filter @@ -288,7 +288,7 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -297,21 +297,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -320,20 +320,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example=[ { - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example=[ { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -} ], contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +} ]}] - parameter tags: (query) Tags to filter by @@ -394,7 +394,7 @@ open class PetAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -403,21 +403,21 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] - - examples: [{example= + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] + - examples: [{contentType=application/xml, example= 123456789 doggie @@ -426,20 +426,20 @@ open class PetAPI: APIBase { aeiou -, contentType=application/xml}, {example={ - "tags" : [ { - "id" : 1, - "name" : "aeiou" - } ], +}, {contentType=application/json, example={ + "photoUrls" : [ "aeiou" ], + "name" : "doggie", "id" : 0, "category" : { - "id" : 6, - "name" : "aeiou" + "name" : "aeiou", + "id" : 6 }, - "status" : "available", - "name" : "doggie", - "photoUrls" : [ "aeiou" ] -}, contentType=application/json}] + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" +}}] - parameter petId: (path) ID of pet to return @@ -629,11 +629,11 @@ open class PetAPI: APIBase { - OAuth: - type: oauth2 - name: petstore_auth - - examples: [{example={ - "message" : "aeiou", + - examples: [{contentType=application/json, example={ "code" : 0, - "type" : "aeiou" -}, contentType=application/json}] + "type" : "aeiou", + "message" : "aeiou" +}}] - parameter petId: (path) ID of pet to update - parameter additionalMetadata: (form) Additional data to pass to server (optional) diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift index 691d82b520d..8624801f51c 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift @@ -104,9 +104,9 @@ open class StoreAPI: APIBase { - API Key: - type: apiKey api_key - name: api_key - - examples: [{example={ + - examples: [{contentType=application/json, example={ "key" : 0 -}, contentType=application/json}] +}}] - returns: RequestBuilder<[String:Int32]> */ @@ -159,36 +159,36 @@ open class StoreAPI: APIBase { Find purchase order by ID - GET /store/order/{order_id} - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter orderId: (path) ID of pet that needs to be fetched @@ -244,36 +244,36 @@ open class StoreAPI: APIBase { Place an order for a pet - POST /store/order - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] - - examples: [{example= + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] + - examples: [{contentType=application/xml, example= 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ "petId" : 6, - "complete" : false, - "status" : "placed", "quantity" : 1, - "shipDate" : "2000-01-23T04:56:07.000+00:00" -}, contentType=application/json}] + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" +}}] - parameter body: (body) order placed for purchasing the pet diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift index 1cff31de121..09e55063829 100644 --- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift +++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift @@ -265,7 +265,7 @@ open class UserAPI: APIBase { Get user by user name - GET /user/{username} - - - examples: [{example= + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -274,17 +274,17 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] - - examples: [{example= + "username" : "aeiou" +}}] + - examples: [{contentType=application/xml, example= 123456789 aeiou aeiou @@ -293,16 +293,16 @@ open class UserAPI: APIBase { aeiou aeiou 123 -, contentType=application/xml}, {example={ - "id" : 0, +}, {contentType=application/json, example={ + "firstName" : "aeiou", "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, "phone" : "aeiou", - "username" : "aeiou", + "id" : 0, "email" : "aeiou", - "userStatus" : 6, - "firstName" : "aeiou", - "password" : "aeiou" -}, contentType=application/json}] + "username" : "aeiou" +}}] - parameter username: (path) The name that needs to be fetched. Use user1 for testing. @@ -362,8 +362,8 @@ open class UserAPI: APIBase { - - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] - - examples: [{example=aeiou, contentType=application/xml}, {example="aeiou", contentType=application/json}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] + - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}] - parameter username: (query) The user name for login - parameter password: (query) The password for login in clear text diff --git a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION index f9f7450d135..7fea99011a6 100644 --- a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml index 34aa0e3f531..f11c37b1387 100644 --- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml +++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml @@ -109,11 +109,11 @@ paths: type: "array" items: type: "string" - default: "available" enum: - "available" - "pending" - "sold" + default: "available" collectionFormat: "csv" responses: 200: @@ -623,10 +623,10 @@ paths: type: "array" items: type: "string" - default: "$" enum: - ">" - "$" + default: "$" - name: "enum_form_string" in: "formData" description: "Form parameter enum test (string)" @@ -644,10 +644,10 @@ paths: type: "array" items: type: "string" - default: "$" enum: - ">" - "$" + default: "$" - name: "enum_header_string" in: "header" description: "Header parameter enum test (string)" @@ -665,10 +665,10 @@ paths: type: "array" items: type: "string" - default: "$" enum: - ">" - "$" + default: "$" - name: "enum_query_string" in: "query" description: "Query parameter enum test (string)" @@ -964,13 +964,6 @@ definitions: complete: type: "boolean" default: false - example: - petId: 6 - quantity: 1 - id: 0 - shipDate: "2000-01-23T04:56:07.000+00:00" - complete: false - status: "placed" xml: name: "Order" Category: @@ -981,9 +974,6 @@ definitions: format: "int64" name: type: "string" - example: - name: "aeiou" - id: 6 xml: name: "Category" User: @@ -1009,15 +999,6 @@ definitions: type: "integer" format: "int32" description: "User Status" - example: - firstName: "aeiou" - lastName: "aeiou" - password: "aeiou" - userStatus: 6 - phone: "aeiou" - id: 0 - email: "aeiou" - username: "aeiou" xml: name: "User" Tag: @@ -1028,9 +1009,6 @@ definitions: format: "int64" name: type: "string" - example: - name: "aeiou" - id: 1 xml: name: "Tag" Pet: @@ -1069,18 +1047,6 @@ definitions: - "available" - "pending" - "sold" - example: - photoUrls: - - "aeiou" - name: "doggie" - id: 0 - category: - name: "aeiou" - id: 6 - tags: - - name: "aeiou" - id: 1 - status: "available" xml: name: "Pet" ApiResponse: @@ -1093,10 +1059,6 @@ definitions: type: "string" message: type: "string" - example: - code: 0 - type: "aeiou" - message: "aeiou" $special[model.name]: properties: $special[property.name]: @@ -1215,6 +1177,7 @@ definitions: byte: type: "string" format: "byte" + pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" binary: type: "string" format: "binary" @@ -1298,8 +1261,6 @@ definitions: properties: client: type: "string" - example: - client: "aeiou" ReadOnlyFirst: type: "object" properties: @@ -1426,10 +1387,6 @@ definitions: $ref: "#/definitions/OuterString" my_boolean: $ref: "#/definitions/OuterBoolean" - example: - my_string: {} - my_number: {} - my_boolean: {} externalDocs: description: "Find out more about Swagger" url: "http://swagger.io" diff --git a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION index f9f7450d135..7fea99011a6 100644 --- a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION index f9f7450d135..7fea99011a6 100644 --- a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index c2d08f8e01f..3446ff8eac8 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -723,14 +723,6 @@ }, "title" : "Pet Order", "description" : "An order for a pets from the pet store", - "example" : { - "petId" : 6, - "quantity" : 1, - "id" : 0, - "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" - }, "xml" : { "name" : "Order" } @@ -748,10 +740,6 @@ }, "title" : "Pet catehgry", "description" : "A category for a pet", - "example" : { - "name" : "aeiou", - "id" : 6 - }, "xml" : { "name" : "Category" } @@ -789,16 +777,6 @@ }, "title" : "a User", "description" : "A User who is purchasing from the pet store", - "example" : { - "firstName" : "aeiou", - "lastName" : "aeiou", - "password" : "aeiou", - "userStatus" : 6, - "phone" : "aeiou", - "id" : 0, - "email" : "aeiou", - "username" : "aeiou" - }, "xml" : { "name" : "User" } @@ -816,10 +794,6 @@ }, "title" : "Pet Tag", "description" : "A tag for a pet", - "example" : { - "name" : "aeiou", - "id" : 1 - }, "xml" : { "name" : "Tag" } @@ -867,20 +841,6 @@ }, "title" : "a Pet", "description" : "A pet for sale in the pet store", - "example" : { - "photoUrls" : [ "aeiou" ], - "name" : "doggie", - "id" : 0, - "category" : { - "name" : "aeiou", - "id" : 6 - }, - "tags" : [ { - "name" : "aeiou", - "id" : 1 - } ], - "status" : "available" - }, "xml" : { "name" : "Pet" } @@ -900,12 +860,7 @@ } }, "title" : "An uploaded response", - "description" : "Describes the result of uploading an image resource", - "example" : { - "code" : 0, - "type" : "aeiou", - "message" : "aeiou" - } + "description" : "Describes the result of uploading an image resource" } }, "externalDocs" : { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java index cf49e7062ad..bbb02c85253 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java @@ -179,7 +179,7 @@ public FormatTest string(String string) { * @return _byte **/ @NotNull - public byte[] getByte() { + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java index a2f6796aac2..339ed6e5e5f 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java @@ -160,7 +160,7 @@ public FormatTest _byte(byte[] _byte) { @ApiModelProperty(required = true, value = "") @NotNull - public byte[] getByte() { + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } public void setByte(byte[] _byte) { diff --git a/samples/server/petstore/jaxrs-spec/swagger.json b/samples/server/petstore/jaxrs-spec/swagger.json index d7bb46fa9a3..6342606de64 100644 --- a/samples/server/petstore/jaxrs-spec/swagger.json +++ b/samples/server/petstore/jaxrs-spec/swagger.json @@ -1311,7 +1311,8 @@ }, "byte" : { "type" : "string", - "format" : "byte" + "format" : "byte", + "pattern" : "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" }, "binary" : { "type" : "string", diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java index bdd53cb3e5d..8b5e5b18ec0 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java @@ -223,7 +223,7 @@ public FormatTest _byte(byte[] _byte) { @JsonProperty("byte") @ApiModelProperty(required = true, value = "") @NotNull - public byte[] getByte() { + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java index bdd53cb3e5d..8b5e5b18ec0 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java @@ -223,7 +223,7 @@ public FormatTest _byte(byte[] _byte) { @JsonProperty("byte") @ApiModelProperty(required = true, value = "") @NotNull - public byte[] getByte() { + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } diff --git a/samples/server/petstore/lumen/lib/app/Http/Controllers/FakeApi.php b/samples/server/petstore/lumen/lib/app/Http/Controllers/FakeApi.php index ae04d8aadca..0d75f85ede7 100644 --- a/samples/server/petstore/lumen/lib/app/Http/Controllers/FakeApi.php +++ b/samples/server/petstore/lumen/lib/app/Http/Controllers/FakeApi.php @@ -91,8 +91,8 @@ public function testEndpointParameters() if (!isset($input['pattern_without_delimiter'])) { throw new \InvalidArgumentException('Missing the required parameter $pattern_without_delimiter when calling testEndpointParameters'); } - if (!preg_match("/^[A-Z].", $input['pattern_without_delimiter'])) { - throw new \InvalidArgumentException('invalid value for $pattern_without_delimiter when calling FakeApi.testEndpointParameters, must conform to the pattern /^[A-Z]..'); + if (!preg_match("/^[A-Z].*/", $input['pattern_without_delimiter'])) { + throw new \InvalidArgumentException('invalid value for $pattern_without_delimiter when calling FakeApi.testEndpointParameters, must conform to the pattern /^[A-Z].*/.'); } $pattern_without_delimiter = $input['pattern_without_delimiter']; diff --git a/samples/server/petstore/nancyfx/IO.Swagger.sln b/samples/server/petstore/nancyfx/IO.Swagger.sln index 5d8c69c5c30..1e40deb1a14 100644 --- a/samples/server/petstore/nancyfx/IO.Swagger.sln +++ b/samples/server/petstore/nancyfx/IO.Swagger.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.0.0 MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{768B8DC6-54EE-4D40-9B20-7857E1D742A4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,10 +10,10 @@ Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution -{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Debug|Any CPU.Build.0 = Debug|Any CPU -{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Release|Any CPU.ActiveCfg = Release|Any CPU -{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Release|Any CPU.Build.0 = Release|Any CPU +{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.Build.0 = Debug|Any CPU +{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.ActiveCfg = Release|Any CPU +{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.Build.0 = Release|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj b/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj index ad4e5e7a4bb..e1577197b6f 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - {7D0AE5BB-FFF1-4523-83ED-A60492D321D5} + {768B8DC6-54EE-4D40-9B20-7857E1D742A4} Library Properties IO.Swagger.v2 diff --git a/samples/server/petstore/undertow/.swagger-codegen/VERSION b/samples/server/petstore/undertow/.swagger-codegen/VERSION index f9f7450d135..7fea99011a6 100644 --- a/samples/server/petstore/undertow/.swagger-codegen/VERSION +++ b/samples/server/petstore/undertow/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/undertow/src/main/resources/config/swagger.json b/samples/server/petstore/undertow/src/main/resources/config/swagger.json index c2d08f8e01f..3446ff8eac8 100644 --- a/samples/server/petstore/undertow/src/main/resources/config/swagger.json +++ b/samples/server/petstore/undertow/src/main/resources/config/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -723,14 +723,6 @@ }, "title" : "Pet Order", "description" : "An order for a pets from the pet store", - "example" : { - "petId" : 6, - "quantity" : 1, - "id" : 0, - "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" - }, "xml" : { "name" : "Order" } @@ -748,10 +740,6 @@ }, "title" : "Pet catehgry", "description" : "A category for a pet", - "example" : { - "name" : "aeiou", - "id" : 6 - }, "xml" : { "name" : "Category" } @@ -789,16 +777,6 @@ }, "title" : "a User", "description" : "A User who is purchasing from the pet store", - "example" : { - "firstName" : "aeiou", - "lastName" : "aeiou", - "password" : "aeiou", - "userStatus" : 6, - "phone" : "aeiou", - "id" : 0, - "email" : "aeiou", - "username" : "aeiou" - }, "xml" : { "name" : "User" } @@ -816,10 +794,6 @@ }, "title" : "Pet Tag", "description" : "A tag for a pet", - "example" : { - "name" : "aeiou", - "id" : 1 - }, "xml" : { "name" : "Tag" } @@ -867,20 +841,6 @@ }, "title" : "a Pet", "description" : "A pet for sale in the pet store", - "example" : { - "photoUrls" : [ "aeiou" ], - "name" : "doggie", - "id" : 0, - "category" : { - "name" : "aeiou", - "id" : 6 - }, - "tags" : [ { - "name" : "aeiou", - "id" : 1 - } ], - "status" : "available" - }, "xml" : { "name" : "Pet" } @@ -900,12 +860,7 @@ } }, "title" : "An uploaded response", - "description" : "Describes the result of uploading an image resource", - "example" : { - "code" : 0, - "type" : "aeiou", - "message" : "aeiou" - } + "description" : "Describes the result of uploading an image resource" } }, "externalDocs" : { diff --git a/samples/server/petstore/ze-ph/src/App/DTO/FormatTest.php b/samples/server/petstore/ze-ph/src/App/DTO/FormatTest.php index e9e8a5b763c..25bab614910 100644 --- a/samples/server/petstore/ze-ph/src/App/DTO/FormatTest.php +++ b/samples/server/petstore/ze-ph/src/App/DTO/FormatTest.php @@ -63,6 +63,8 @@ class FormatTest public $string; /** * @DTA\Data(field="byte") + * @DTA\Validator(name="Type", options={"type":"string"}) + * @DTA\Validator(name="Regex", options={"pattern":"/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/"}) * @var string */ public $byte;