Add support for multiple inheritance (#1664)

* add all parent names

* clean up supportsInheritance

* fix npe

* fix allVars, fix test cases

* add more tests, remove comments

* update docker m2 cache dir, add more tests, fix mandatory

* update samples

* regenerate js spec files

* add logic to detect self reference

* add isSelfReference flag to codegen property

* add ruby tests for cat model

* remove debugging info

* fix JS allvars not have x-js-doctype

* update samples

* update js samples
This commit is contained in:
William Cheng
2018-12-15 00:24:36 +08:00
committed by GitHub
parent 587bd56655
commit 8c599ebf12
214 changed files with 835 additions and 454 deletions

View File

@@ -1 +1 @@
3.3.4-SNAPSHOT
4.0.0-SNAPSHOT

View File

@@ -13,10 +13,6 @@ Name | Type | Description | Notes
## Enum: {String: String}
* `UPPER` (value: `"UPPER"`)
* `lower` (value: `"lower"`)

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*
@@ -44,7 +44,7 @@
* @class
* @extends module:model/Animal
* @implements module:model/Animal
* @param className {}
* @param className {String}
*/
var exports = function(className) {
var _this = this;

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*
@@ -44,7 +44,7 @@
* @class
* @extends module:model/Animal
* @implements module:model/Animal
* @param className {}
* @param className {String}
*/
var exports = function(className) {
var _this = this;

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 3.3.4-SNAPSHOT
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*

View File

@@ -1,3 +1,18 @@
/**
* OpenAPI Petstore
* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
*
* OpenAPI spec version: 1.0.0
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD.
@@ -7,15 +22,15 @@
factory(require('expect.js'), require('../../src/index'));
} else {
// Browser globals (root is window)
factory(root.expect, root.OpenAPIPetstore);
factory(root.expect, root.OpenApiPetstore);
}
}(this, function(expect, OpenAPIPetstore) {
}(this, function(expect, OpenApiPetstore) {
'use strict';
var instance;
beforeEach(function() {
instance = new OpenAPIPetstore.Cat();
instance = new OpenApiPetstore.Cat();
});
var getProperty = function(object, getter, property) {
@@ -37,13 +52,13 @@
describe('Cat', function() {
it('should create an instance of Cat', function() {
// uncomment below and update the code to test Cat
//var instane = new OpenAPIPetstore.Cat();
//expect(instance).to.be.a(OpenAPIPetstore.Cat);
//var instance = new OpenApiPetstore.Cat();
//expect(instance).to.be.a(OpenApiPetstore.Cat);
});
it('should have the property declawed (base name: "declawed")', function() {
// uncomment below and update the code to test the property declawed
//var instane = new OpenAPIPetstore.Cat();
//var instance = new OpenApiPetstore.Cat();
//expect(instance).to.be();
});

View File

@@ -1,3 +1,18 @@
/**
* OpenAPI Petstore
* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
*
* OpenAPI spec version: 1.0.0
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.0-SNAPSHOT
*
* Do not edit the class manually.
*
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD.
@@ -7,15 +22,15 @@
factory(require('expect.js'), require('../../src/index'));
} else {
// Browser globals (root is window)
factory(root.expect, root.OpenAPIPetstore);
factory(root.expect, root.OpenApiPetstore);
}
}(this, function(expect, OpenAPIPetstore) {
}(this, function(expect, OpenApiPetstore) {
'use strict';
var instance;
beforeEach(function() {
instance = new OpenAPIPetstore.Dog();
instance = new OpenApiPetstore.Dog();
});
var getProperty = function(object, getter, property) {
@@ -37,13 +52,13 @@
describe('Dog', function() {
it('should create an instance of Dog', function() {
// uncomment below and update the code to test Dog
//var instane = new OpenAPIPetstore.Dog();
//expect(instance).to.be.a(OpenAPIPetstore.Dog);
//var instance = new OpenApiPetstore.Dog();
//expect(instance).to.be.a(OpenApiPetstore.Dog);
});
it('should have the property breed (base name: "breed")', function() {
// uncomment below and update the code to test the property breed
//var instane = new OpenAPIPetstore.Dog();
//var instance = new OpenApiPetstore.Dog();
//expect(instance).to.be();
});