Skip to content

Commit

Permalink
Merge branch 'master' into feature/metadata
Browse files Browse the repository at this point in the history 
# Conflicts:
#	tools/V4-CSDL-to-OpenAPI.xsl
#	tools/tests/Northwind-key-as-segment.openapi3.json
#	tools/tests/Northwind-key-as-segment.swagger.json
#	tools/tests/TripPin.openapi3.json
#	tools/tests/TripPin.swagger.json
#	tools/tests/annotations.openapi3.json
#	tools/tests/annotations.swagger.json
#	tools/tests/authorization.openapi3.json
#	tools/tests/authorization.swagger.json
#	tools/tests/containment.openapi3.json
#	tools/tests/containment.swagger.json
#	tools/tests/csdl-16.1.openapi3.json
#	tools/tests/csdl-16.1.swagger.json
#	tools/tests/descriptions.openapi3.json
#	tools/tests/descriptions.swagger.json
#	tools/tests/odata-rw-v2.openapi3.json
#	tools/tests/odata-rw-v2.swagger.json
#	tools/tests/odata-rw-v3.openapi3.json
#	tools/tests/odata-rw-v3.swagger.json
  • Loading branch information
@snebjorn
snebjorn committed May 3, 2020
2 parents 491334b + b382992 commit 889743d
Show file tree
Hide file tree
Showing 31 changed files with 1,369 additions and 5 deletions.
71 changes: 71 additions & 0 deletions examples/TripPin.openapi3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
"type": "object",
"title": "Collection of Photo",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -364,6 +367,9 @@
"type": "object",
"title": "Collection of Person",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -597,6 +603,9 @@
"type": "object",
"title": "Collection of Trip",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -784,6 +793,9 @@
"type": "object",
"title": "Collection of Person",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -953,6 +965,9 @@
"type": "object",
"title": "Collection of Trip",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1164,6 +1179,9 @@
"type": "object",
"title": "Collection of Person",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1275,6 +1293,9 @@
"type": "object",
"title": "Collection of Photo",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1395,6 +1416,9 @@
"type": "object",
"title": "Collection of PlanItem",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1686,6 +1710,9 @@
"type": "object",
"title": "Collection of Airline",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -1914,6 +1941,9 @@
"type": "object",
"title": "Collection of Airport",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2151,6 +2181,9 @@
"type": "object",
"title": "Collection of Trip",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2317,6 +2350,9 @@
"type": "object",
"title": "Collection of Person",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2476,6 +2512,9 @@
"type": "object",
"title": "Collection of Trip",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2669,6 +2708,9 @@
"type": "object",
"title": "Collection of Person",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2771,6 +2813,9 @@
"type": "object",
"title": "Collection of Photo",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -2882,6 +2927,9 @@
"type": "object",
"title": "Collection of PlanItem",
"properties": {
"@odata.count": {
"$ref": "#/components/schemas/count"
},
"value": {
"type": "array",
"items": {
Expand Down Expand Up @@ -3570,12 +3618,18 @@
"format": "int64",
"example": "42"
},
"[email protected]": {
"$ref": "#/components/schemas/count"
},
"Friends": {
"type": "array",
"items": {
"$ref": "#/components/schemas/Microsoft.OData.SampleService.Models.TripPin.Person"
}
},
"[email protected]": {
"$ref": "#/components/schemas/count"
},
"Trips": {
"type": "array",
"items": {
Expand Down Expand Up @@ -4360,12 +4414,18 @@
"type": "string"
}
},
"[email protected]": {
"$ref": "#/components/schemas/count"
},
"Photos": {
"type": "array",
"items": {
"$ref": "#/components/schemas/Microsoft.OData.SampleService.Models.TripPin.Photo"
}
},
"[email protected]": {
"$ref": "#/components/schemas/count"
},
"PlanItems": {
"type": "array",
"items": {
Expand Down Expand Up @@ -4480,6 +4540,17 @@
}
}
},
"count": {
"anyOf": [
{
"type": "number"
},
{
"type": "string"
}
],
"description": "The number of entities in the collection. Available when using the [$count](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_SystemQueryOptioncount) query option."
},
"geoPoint": {
"type": "object",
"properties": {
Expand Down
Loading

0 comments on commit 889743d

Please sign in to comment.