Skip to content

Commit e293439

Browse files
authored
Merge branch 'master' into feat/W-21315032
2 parents 7f39c2c + d4da65a commit e293439

12 files changed

Lines changed: 9428 additions & 115 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ demo/models/flattened/*.json
6767
!demo/models/avro2.json
6868
!demo/models/grpc-test.json
6969
!demo/models/grpc-test-compact.json
70+
!demo/models/product-order-deep-allof.json
7071

7172
.idea/
7273
.sfdx

demo/apis.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@
3838
"models/multiple-messages/multiple-messages.yaml": "ASYNC 2.0",
3939
"models/APIC-560/APIC-560.yaml": "ASYNC 2.0",
4040
"models/agens-api/agents-api.yaml": "OAS 3.0",
41-
"models/nested-examples/nested-examples-oas3.json": "OAS 3.0"
41+
"models/nested-examples/nested-examples-oas3.json": "OAS 3.0",
42+
"models/nullable/nullable.yaml": "OAS 3.0"
4243
}

demo/element/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class ApicApplication extends DemoBase {
1414
constructor() {
1515
super();
1616
this.apis = [
17+
['product-order-deep-allof', 'W-21368901 - Deep allOf'],
1718
['grpc-test', 'gRPC API'],
1819
['google-drive-api', 'Google Drive API'],
1920
['httpbin', 'HTTPbin API'],

0 commit comments

Comments
 (0)