Commit a06a6a3b authored by Michel Roy's avatar Michel Roy
Browse files

implicit naming

parent 688d2fb1
Pipeline #5064 passed with stage
in 0 seconds
...@@ -58,12 +58,7 @@ ...@@ -58,12 +58,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ApplicationList"
"properties": {
"applicationList": {
"$ref": "#/components/schemas/ApplicationList"
}
}
} }
} }
} }
...@@ -97,12 +92,7 @@ ...@@ -97,12 +92,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/AppContext"
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext"
}
}
} }
} }
} }
...@@ -114,12 +104,7 @@ ...@@ -114,12 +104,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/AppContext"
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext"
}
}
} }
} }
} }
...@@ -150,34 +135,11 @@ ...@@ -150,34 +135,11 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/InlineNotification"
"properties": { },
"notification": { "example": {
"oneOf": [ "notificationType": "ApplicationContextDeleteNotification",
{ "contextId": "contextId123"
"$ref": "#/components/schemas/AddressChangeNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextDeleteNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextUpdateNotification"
},
{
"$ref": "#/components/schemas/ApplicationLocationAvailabilityNotification"
}
],
"discriminator": {
"propertyName": "notificationType"
}
}
},
"example": {
"notification": {
"notificationType": "ApplicationContextDeleteNotification",
"contextId": "contextId123"
}
}
} }
} }
} }
...@@ -207,12 +169,7 @@ ...@@ -207,12 +169,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/AppContext"
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext"
}
}
} }
} }
} }
...@@ -285,12 +242,7 @@ ...@@ -285,12 +242,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ApplicationLocationAvailability"
"properties": {
"applicationLocationAvailability": {
"$ref": "#/components/schemas/ApplicationLocationAvailability"
}
}
} }
} }
} }
...@@ -302,12 +254,7 @@ ...@@ -302,12 +254,7 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ApplicationLocationAvailability"
"properties": {
"applicationLocationAvailability": {
"$ref": "#/components/schemas/ApplicationLocationAvailability"
}
}
} }
} }
} }
...@@ -336,14 +283,9 @@ ...@@ -336,14 +283,9 @@
"400": { "400": {
"description": "Bad Request : used to indicate that incorrect parameters were passed to the request.", "description": "Bad Request : used to indicate that incorrect parameters were passed to the request.",
"content": { "content": {
"application/json": { "application/problem+json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ProblemDetails"
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
} }
} }
} }
...@@ -351,14 +293,9 @@ ...@@ -351,14 +293,9 @@
"401": { "401": {
"description": "Unauthorized : used when the client did not submit credentials.", "description": "Unauthorized : used when the client did not submit credentials.",
"content": { "content": {
"application/json": { "application/problem+json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ProblemDetails"
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
} }
} }
} }
...@@ -366,17 +303,9 @@ ...@@ -366,17 +303,9 @@
"403": { "403": {
"description": "Forbidden : operation is not allowed given the current status of the resource.", "description": "Forbidden : operation is not allowed given the current status of the resource.",
"content": { "content": {
"application/json": { "application/problem+json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ProblemDetails"
"required": [
"problemDetails"
],
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
} }
} }
} }
...@@ -384,14 +313,9 @@ ...@@ -384,14 +313,9 @@
"404": { "404": {
"description": "Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.", "description": "Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.",
"content": { "content": {
"application/json": { "application/problem+json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/ProblemDetails"
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
} }
} }
} }
...@@ -999,6 +923,25 @@ ...@@ -999,6 +923,25 @@
], ],
"x-etsi-ref": "6.4.5" "x-etsi-ref": "6.4.5"
}, },
"InlineNotification": {
"oneOf": [
{
"$ref": "#/components/schemas/AddressChangeNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextDeleteNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextUpdateNotification"
},
{
"$ref": "#/components/schemas/ApplicationLocationAvailabilityNotification"
}
],
"discriminator": {
"propertyName": "notificationType"
}
},
"LocationConstraints": { "LocationConstraints": {
"properties": { "properties": {
"area": { "area": {
......
...@@ -39,10 +39,7 @@ paths: ...@@ -39,10 +39,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: "#/components/schemas/ApplicationList"
properties:
applicationList:
$ref: "#/components/schemas/ApplicationList"
400: 400:
$ref: "#/components/responses/400" $ref: "#/components/responses/400"
401: 401:
...@@ -64,10 +61,7 @@ paths: ...@@ -64,10 +61,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/AppContext'
properties:
appContext:
$ref: '#/components/schemas/AppContext'
parameters: [] parameters: []
responses: responses:
201: 201:
...@@ -75,10 +69,7 @@ paths: ...@@ -75,10 +69,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: "#/components/schemas/AppContext"
properties:
appContext:
$ref: "#/components/schemas/AppContext"
400: 400:
$ref: '#/components/responses/400' $ref: '#/components/responses/400'
401: 401:
...@@ -100,20 +91,10 @@ paths: ...@@ -100,20 +91,10 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/InlineNotification'
properties: example:
notification: notificationType: ApplicationContextDeleteNotification
oneOf: contextId: 'contextId123'
- $ref: '#/components/schemas/AddressChangeNotification'
- $ref: '#/components/schemas/ApplicationContextDeleteNotification'
- $ref: '#/components/schemas/ApplicationContextUpdateNotification'
- $ref: '#/components/schemas/ApplicationLocationAvailabilityNotification'
discriminator:
propertyName: notificationType
example:
notification:
notificationType: ApplicationContextDeleteNotification
contextId: 'contextId123'
responses: responses:
204: 204:
$ref: '#/components/responses/204' $ref: '#/components/responses/204'
...@@ -130,10 +111,7 @@ paths: ...@@ -130,10 +111,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/AppContext'
properties:
appContext:
$ref: '#/components/schemas/AppContext'
parameters: parameters:
- $ref: '#/components/parameters/Path.contextId' - $ref: '#/components/parameters/Path.contextId'
responses: responses:
...@@ -179,10 +157,7 @@ paths: ...@@ -179,10 +157,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/ApplicationLocationAvailability'
properties:
applicationLocationAvailability:
$ref: '#/components/schemas/ApplicationLocationAvailability'
parameters: [] parameters: []
responses: responses:
200: 200:
...@@ -190,10 +165,7 @@ paths: ...@@ -190,10 +165,7 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: "#/components/schemas/ApplicationLocationAvailability"
properties:
applicationLocationAvailability:
$ref: "#/components/schemas/ApplicationLocationAvailability"
400: 400:
$ref: '#/components/responses/400' $ref: '#/components/responses/400'
401: 401:
...@@ -209,41 +181,27 @@ components: ...@@ -209,41 +181,27 @@ components:
400: 400:
description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.' description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.'
content: content:
application/json: application/problem+json:
schema: schema:
type: object $ref: '#/components/schemas/ProblemDetails'
properties:
problemDetails:
$ref: '#/components/schemas/ProblemDetails'
401: 401:
description: 'Unauthorized : used when the client did not submit credentials.' description: 'Unauthorized : used when the client did not submit credentials.'
content: content:
application/json: application/problem+json:
schema: schema:
type: object $ref: '#/components/schemas/ProblemDetails'
properties:
problemDetails:
$ref: '#/components/schemas/ProblemDetails'
403: 403:
description: 'Forbidden : operation is not allowed given the current status of the resource.' description: 'Forbidden : operation is not allowed given the current status of the resource.'
content: content:
application/json: application/problem+json:
schema: schema:
type: object $ref: '#/components/schemas/ProblemDetails'
required:
- problemDetails
properties:
problemDetails:
$ref: '#/components/schemas/ProblemDetails'
404: 404:
description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.' description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.'
content: content:
application/json: application/problem+json:
schema: schema:
type: object $ref: '#/components/schemas/ProblemDetails'
properties:
problemDetails:
$ref: '#/components/schemas/ProblemDetails'
parameters: parameters:
Query.appName: Query.appName:
name: appName name: appName
...@@ -749,6 +707,14 @@ components: ...@@ -749,6 +707,14 @@ components:
- notificationType - notificationType
- availableLocations - availableLocations
x-etsi-ref: 6.4.5 x-etsi-ref: 6.4.5
InlineNotification:
oneOf:
- $ref: '#/components/schemas/AddressChangeNotification'
- $ref: '#/components/schemas/ApplicationContextDeleteNotification'
- $ref: '#/components/schemas/ApplicationContextUpdateNotification'
- $ref: '#/components/schemas/ApplicationLocationAvailabilityNotification'
discriminator:
propertyName: notificationType
LocationConstraints: LocationConstraints:
properties: properties:
area: area:
......
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