diff --git a/modules/swagger-codegen/src/main/resources/Javascript/partial_model_generic.mustache b/modules/swagger-codegen/src/main/resources/Javascript/partial_model_generic.mustache index d8a9d250a4..43f8d4e543 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/partial_model_generic.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/partial_model_generic.mustache @@ -96,8 +96,20 @@ exports.prototype['{{baseName}}'] = {{#defaultValue}}{{{defaultValue}}}{{/defaul } {{/vars}}{{/emitModelMethods}} -{{#vars}}{{#isEnum}}{{>partial_model_inner_enum}}{{/isEnum}}{{#items.isEnum}}{{#items}} -{{>partial_model_inner_enum}}{{/items}}*/{{/items.isEnum}}{{/vars}} +{{#vars}} +{{#isEnum}} +{{^isContainer}} +{{>partial_model_inner_enum}} +{{/isContainer}} +{{/isEnum}} +{{#items.isEnum}} +{{#items}} +{{^isContainer}} +{{>partial_model_inner_enum}} +{{/isContainer}} +{{/items}} +{{/items.isEnum}} +{{/vars}} return exports; {{/model}}{{/models}}})); diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index 5a0511e45a..00fb358d9e 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1101,13 +1101,15 @@ definitions: type: array items: $ref: '#/definitions/ReadOnlyFirst' - array_of_enum: - type: array - items: - type: string - enum: - - UPPER - - lower + # commented out the below test case for array of enum for the time being + # as not all language can handle it + #array_of_enum: + # type: array + # items: + # type: string + # enum: + # - UPPER + # - lower NumberOnly: type: object properties: diff --git a/samples/client/petstore-security-test/javascript/README.md b/samples/client/petstore-security-test/javascript/README.md index db069ae609..b77d3ebd6a 100644 --- a/samples/client/petstore-security-test/javascript/README.md +++ b/samples/client/petstore-security-test/javascript/README.md @@ -6,7 +6,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/ - API version: 1.0.0 ' \" =end - Package version: 1.0.0 =end -- Build date: 2016-06-28T23:09:17.545+08:00 +- Build date: 2016-06-29T21:40:05.384+08:00 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen ## Installation @@ -72,7 +72,7 @@ api.testCodeInjectEnd(opts, callback); ## Documentation for API Endpoints -All URIs are relative to *https://petstore.swagger.io */ ' " =end/v2 */ ' " =end* +All URIs are relative to *https://petstore.swagger.io ' \" =end/v2 ' \" =end* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- diff --git a/samples/client/petstore-security-test/javascript/docs/FakeApi.md b/samples/client/petstore-security-test/javascript/docs/FakeApi.md index 25c5fcebbc..adbbd32fdb 100644 --- a/samples/client/petstore-security-test/javascript/docs/FakeApi.md +++ b/samples/client/petstore-security-test/javascript/docs/FakeApi.md @@ -1,6 +1,6 @@ # SwaggerPetstoreEnd.FakeApi -All URIs are relative to *https://petstore.swagger.io */ ' " =end/v2 */ ' " =end* +All URIs are relative to *https://petstore.swagger.io ' \" =end/v2 ' \" =end* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore-security-test/javascript/src/ApiClient.js b/samples/client/petstore-security-test/javascript/src/ApiClient.js index 527a1df646..b22ed5202a 100644 --- a/samples/client/petstore-security-test/javascript/src/ApiClient.js +++ b/samples/client/petstore-security-test/javascript/src/ApiClient.js @@ -55,9 +55,9 @@ /** * The base URL against which to resolve every API call's (relative) path. * @type {String} - * @default https://petstore.swagger.io */ ' " =end/v2 */ ' " =end + * @default https://petstore.swagger.io ' \" =end/v2 ' \" =end */ - this.basePath = 'https://petstore.swagger.io */ ' " =end/v2 */ ' " =end'.replace(/\/+$/, ''); + this.basePath = 'https://petstore.swagger.io ' \" =end/v2 ' \" =end'.replace(/\/+$/, ''); /** * The authentication methods to be included for all API calls. diff --git a/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js b/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js index 6926c37ebe..8c5d596cdc 100644 --- a/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js +++ b/samples/client/petstore-security-test/javascript/src/model/ModelReturn.js @@ -86,7 +86,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md index e9d651b554..07afbbc8ba 100644 --- a/samples/client/petstore/javascript/README.md +++ b/samples/client/petstore/javascript/README.md @@ -6,7 +6,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/ - API version: 1.0.0 - Package version: 1.0.0 -- Build date: 2016-06-28T23:09:39.810+08:00 +- Build date: 2016-06-29T21:39:55.793+08:00 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen ## Installation diff --git a/samples/client/petstore/javascript/docs/ArrayTest.md b/samples/client/petstore/javascript/docs/ArrayTest.md index 208295d9af..a257651224 100644 --- a/samples/client/petstore/javascript/docs/ArrayTest.md +++ b/samples/client/petstore/javascript/docs/ArrayTest.md @@ -6,13 +6,5 @@ Name | Type | Description | Notes **arrayOfString** | **[String]** | | [optional] **arrayArrayOfInteger** | **[[Integer]]** | | [optional] **arrayArrayOfModel** | **[[ReadOnlyFirst]]** | | [optional] -**arrayOfEnum** | **[String]** | | [optional] - - - -## Enum: [ArrayOfEnumEnum] - - - diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js index a148921327..8eeb82a1e1 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js @@ -92,7 +92,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js index b03f167a5d..ff6fd24da4 100644 --- a/samples/client/petstore/javascript/src/model/Animal.js +++ b/samples/client/petstore/javascript/src/model/Animal.js @@ -94,7 +94,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/AnimalFarm.js b/samples/client/petstore/javascript/src/model/AnimalFarm.js index 0217cfe36b..fcff7cdd7c 100644 --- a/samples/client/petstore/javascript/src/model/AnimalFarm.js +++ b/samples/client/petstore/javascript/src/model/AnimalFarm.js @@ -81,7 +81,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js index f877ed5742..d800bae789 100644 --- a/samples/client/petstore/javascript/src/model/ApiResponse.js +++ b/samples/client/petstore/javascript/src/model/ApiResponse.js @@ -100,7 +100,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js index 5735d16b8a..5c260f258a 100644 --- a/samples/client/petstore/javascript/src/model/ArrayTest.js +++ b/samples/client/petstore/javascript/src/model/ArrayTest.js @@ -59,7 +59,6 @@ - }; /** @@ -82,9 +81,6 @@ if (data.hasOwnProperty('array_array_of_model')) { obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]); } - if (data.hasOwnProperty('array_of_enum')) { - obj['array_of_enum'] = ApiClient.convertToType(data['array_of_enum'], ['String']); - } } return obj; } @@ -101,37 +97,8 @@ * @member {Array.>} array_array_of_model */ exports.prototype['array_array_of_model'] = undefined; - /** - * @member {Array.} array_of_enum - */ - exports.prototype['array_of_enum'] = undefined; - /** - * Allowed values for the array_of_enum property. - * @enum {[String]} - * @readonly - */ - exports.[ArrayOfEnumEnum] = { - }; - - /** - * Allowed values for the arrayOfEnum property. - * @enum {String} - * @readonly - */ - exports.ArrayOfEnumEnum = { - /** - * value: "UPPER" - * @const - */ - "UPPER": "UPPER", - /** - * value: "lower" - * @const - */ - "lower": "lower" }; -*/ return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js index 30a38bd230..d3200bda4e 100644 --- a/samples/client/petstore/javascript/src/model/Cat.js +++ b/samples/client/petstore/javascript/src/model/Cat.js @@ -89,7 +89,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js index 3c88bb84ad..c4b1340c89 100644 --- a/samples/client/petstore/javascript/src/model/Category.js +++ b/samples/client/petstore/javascript/src/model/Category.js @@ -92,7 +92,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js index 75cd6bbd24..24b764d6a3 100644 --- a/samples/client/petstore/javascript/src/model/Dog.js +++ b/samples/client/petstore/javascript/src/model/Dog.js @@ -89,7 +89,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js index ff276b590c..5fe6568b2d 100644 --- a/samples/client/petstore/javascript/src/model/EnumTest.js +++ b/samples/client/petstore/javascript/src/model/EnumTest.js @@ -115,6 +115,7 @@ * @const */ "lower": "lower" }; + /** * Allowed values for the enum_integer property. * @enum {Integer} @@ -131,6 +132,7 @@ * @const */ "-1": -1 }; + /** * Allowed values for the enum_number property. * @enum {Number} diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js index 207ff0339d..be8f3e321d 100644 --- a/samples/client/petstore/javascript/src/model/FormatTest.js +++ b/samples/client/petstore/javascript/src/model/FormatTest.js @@ -184,7 +184,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js index 248831a225..e82b173eda 100644 --- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js @@ -100,7 +100,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js index 257ea5ac52..671d6876a1 100644 --- a/samples/client/petstore/javascript/src/model/Model200Response.js +++ b/samples/client/petstore/javascript/src/model/Model200Response.js @@ -93,7 +93,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js index d883487feb..5358484fb2 100644 --- a/samples/client/petstore/javascript/src/model/ModelReturn.js +++ b/samples/client/petstore/javascript/src/model/ModelReturn.js @@ -85,7 +85,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js index 497af4b301..e2b8eb2c3d 100644 --- a/samples/client/petstore/javascript/src/model/Name.js +++ b/samples/client/petstore/javascript/src/model/Name.js @@ -110,7 +110,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js index 0bcfccbacb..c08836806d 100644 --- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js +++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js @@ -92,7 +92,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js index b9fcb89bc1..b4e6e67ea8 100644 --- a/samples/client/petstore/javascript/src/model/SpecialModelName.js +++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js @@ -84,7 +84,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js index 9f71282ef4..010263babe 100644 --- a/samples/client/petstore/javascript/src/model/Tag.js +++ b/samples/client/petstore/javascript/src/model/Tag.js @@ -92,7 +92,6 @@ - return exports; })); diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js index 40e36f3805..1c77bd4bb0 100644 --- a/samples/client/petstore/javascript/src/model/User.js +++ b/samples/client/petstore/javascript/src/model/User.js @@ -141,7 +141,6 @@ - return exports; }));