Commit 3851063d authored by Walter Featherstone's avatar Walter Featherstone
Browse files

oAuth2Info is not a required parameter & used oneOf for endpoint

parent 39370fa7
...@@ -810,14 +810,31 @@ ...@@ -810,14 +810,31 @@
}, },
"EndPointInfo.Addresses": { "EndPointInfo.Addresses": {
"description": "Entry point information of the service as one or more pairs of IP address and port", "description": "Entry point information of the service as one or more pairs of IP address and port",
"type": "array", "type": "object",
"items": { "required": [
"$ref": "#/components/schemas/EndPointInfo.Address" "addresses"
],
"properties": {
"addresses": {
"type": "array",
"minItems": 0,
"items": {
"$ref": "#/components/schemas/EndPointInfo.Address"
}
}
} }
}, },
"EndPointInfo.Alternative": { "EndPointInfo.Alternative": {
"description": "Entry point information of the service in a format defined by an implementation, or in an external specification.", "description": "Entry point information of the service in a format defined by an implementation, or in an external specification.",
"type": "object" "type": "object",
"required": [
"alternative"
],
"properties": {
"alternative": {
"type": "object"
}
}
}, },
"EndPointInfo.Uri": { "EndPointInfo.Uri": {
"description": "Entry point information of the service", "description": "Entry point information of the service",
...@@ -827,23 +844,17 @@ ...@@ -827,23 +844,17 @@
}, },
"EndPointInfo.Uris": { "EndPointInfo.Uris": {
"description": "Entry point information of the service as string, formatted according to URI syntax", "description": "Entry point information of the service as string, formatted according to URI syntax",
"type": "array",
"items": {
"$ref": "#/components/schemas/EndPointInfo.Uri"
}
},
"EndPointInfo": {
"description": "This type represents information about a transport endpoint",
"type": "object", "type": "object",
"required": [
"uris"
],
"properties": { "properties": {
"uris": { "uris": {
"$ref": "#/components/schemas/EndPointInfo.Uris" "type": "array",
}, "minItems": 0,
"addresses": { "items": {
"$ref": "#/components/schemas/EndPointInfo.Addresses" "$ref": "#/components/schemas/EndPointInfo.Uri"
}, }
"alternative": {
"$ref": "#/components/schemas/EndPointInfo.Alternative"
} }
} }
}, },
...@@ -993,9 +1004,6 @@ ...@@ -993,9 +1004,6 @@
"SecurityInfo": { "SecurityInfo": {
"description": "This type represents security information related to a transport", "description": "This type represents security information related to a transport",
"type": "object", "type": "object",
"required": [
"oAuth2Info"
],
"properties": { "properties": {
"oAuth2Info": { "oAuth2Info": {
"$ref": "#/components/schemas/SecurityInfo.OAuth2Info" "$ref": "#/components/schemas/SecurityInfo.OAuth2Info"
...@@ -1632,7 +1640,19 @@ ...@@ -1632,7 +1640,19 @@
"$ref": "#/components/schemas/TransportInfo.Version" "$ref": "#/components/schemas/TransportInfo.Version"
}, },
"endpoint": { "endpoint": {
"$ref": "#/components/schemas/EndPointInfo" "description": "This type represents information about a transport endpoint",
"type": "object",
"oneOf": [
{
"$ref": "#/components/schemas/EndPointInfo.Uris"
},
{
"$ref": "#/components/schemas/EndPointInfo.Addresses"
},
{
"$ref": "#/components/schemas/EndPointInfo.Alternative"
}
]
}, },
"security": { "security": {
"$ref": "#/components/schemas/SecurityInfo" "$ref": "#/components/schemas/SecurityInfo"
...@@ -2368,12 +2388,6 @@ ...@@ -2368,12 +2388,6 @@
"endpoint": { "endpoint": {
"uris": [ "uris": [
"/meMp1/service/EntryPoint" "/meMp1/service/EntryPoint"
],
"addresses": [
{
"host": "192.0.2.0",
"port": 8080
}
] ]
}, },
"security": { "security": {
...@@ -2408,9 +2422,6 @@ ...@@ -2408,9 +2422,6 @@
"protocol": "HTTP", "protocol": "HTTP",
"version": "2.0", "version": "2.0",
"endpoint": { "endpoint": {
"uris": [
"/meMp1/service/EntryPoint"
],
"addresses": [ "addresses": [
{ {
"host": "192.0.2.0", "host": "192.0.2.0",
......
...@@ -603,14 +603,25 @@ components: ...@@ -603,14 +603,25 @@ components:
description: >- description: >-
Entry point information of the service as one or more pairs of IP Entry point information of the service as one or more pairs of IP
address and port address and port
type: array type: object
items: required:
$ref: '#/components/schemas/EndPointInfo.Address' - addresses
properties:
addresses:
type: array
minItems: 0
items:
$ref: '#/components/schemas/EndPointInfo.Address'
EndPointInfo.Alternative: EndPointInfo.Alternative:
description: >- description: >-
Entry point information of the service in a format defined by an Entry point information of the service in a format defined by an
implementation, or in an external specification. implementation, or in an external specification.
type: object type: object
required:
- alternative
properties:
alternative:
type: object
EndPointInfo.Uri: EndPointInfo.Uri:
description: Entry point information of the service description: Entry point information of the service
type: string type: string
...@@ -620,19 +631,15 @@ components: ...@@ -620,19 +631,15 @@ components:
description: >- description: >-
Entry point information of the service as string, formatted according to Entry point information of the service as string, formatted according to
URI syntax URI syntax
type: array
items:
$ref: '#/components/schemas/EndPointInfo.Uri'
EndPointInfo:
description: This type represents information about a transport endpoint
type: object type: object
required:
- uris
properties: properties:
uris: uris:
$ref: '#/components/schemas/EndPointInfo.Uris' type: array
addresses: minItems: 0
$ref: '#/components/schemas/EndPointInfo.Addresses' items:
alternative: $ref: '#/components/schemas/EndPointInfo.Uri'
$ref: '#/components/schemas/EndPointInfo.Alternative'
LinkType: LinkType:
description: This type represents a type of link and may be referenced from data structures description: This type represents a type of link and may be referenced from data structures
type: object type: object
...@@ -746,8 +753,6 @@ components: ...@@ -746,8 +753,6 @@ components:
SecurityInfo: SecurityInfo:
description: This type represents security information related to a transport description: This type represents security information related to a transport
type: object type: object
required:
- oAuth2Info
properties: properties:
oAuth2Info: oAuth2Info:
$ref: '#/components/schemas/SecurityInfo.OAuth2Info' $ref: '#/components/schemas/SecurityInfo.OAuth2Info'
...@@ -1278,7 +1283,12 @@ components: ...@@ -1278,7 +1283,12 @@ components:
version: version:
$ref: '#/components/schemas/TransportInfo.Version' $ref: '#/components/schemas/TransportInfo.Version'
endpoint: endpoint:
$ref: '#/components/schemas/EndPointInfo' description: This type represents information about a transport endpoint
type: object
oneOf:
- $ref: '#/components/schemas/EndPointInfo.Uris'
- $ref: '#/components/schemas/EndPointInfo.Addresses'
- $ref: '#/components/schemas/EndPointInfo.Alternative'
security: security:
$ref: '#/components/schemas/SecurityInfo' $ref: '#/components/schemas/SecurityInfo'
implSpecificInfo: implSpecificInfo:
...@@ -1824,9 +1834,6 @@ components: ...@@ -1824,9 +1834,6 @@ components:
endpoint: endpoint:
uris: uris:
- '/meMp1/service/EntryPoint' - '/meMp1/service/EntryPoint'
addresses:
- host: '192.0.2.0'
port: 8080
security: security:
oAuth2Info: oAuth2Info:
grantTypes: 'OAUTH2_CLIENT_CREDENTIALS' grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
...@@ -1852,8 +1859,6 @@ components: ...@@ -1852,8 +1859,6 @@ components:
protocol: 'HTTP' protocol: 'HTTP'
version: '2.0' version: '2.0'
endpoint: endpoint:
uris:
- '/meMp1/service/EntryPoint'
addresses: addresses:
- host: '192.0.2.0' - host: '192.0.2.0'
port: 8080 port: 8080
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment