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,15 +58,10 @@ ...@@ -58,15 +58,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"applicationList": {
"$ref": "#/components/schemas/ApplicationList" "$ref": "#/components/schemas/ApplicationList"
} }
} }
} }
}
}
}, },
"400": { "400": {
"$ref": "#/components/responses/400" "$ref": "#/components/responses/400"
...@@ -97,15 +92,10 @@ ...@@ -97,15 +92,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext" "$ref": "#/components/schemas/AppContext"
} }
} }
} }
}
}
}, },
"parameters": [], "parameters": [],
"responses": { "responses": {
...@@ -114,15 +104,10 @@ ...@@ -114,15 +104,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext" "$ref": "#/components/schemas/AppContext"
} }
} }
} }
}
}
}, },
"400": { "400": {
"$ref": "#/components/responses/400" "$ref": "#/components/responses/400"
...@@ -150,37 +135,14 @@ ...@@ -150,37 +135,14 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "$ref": "#/components/schemas/InlineNotification"
"properties": {
"notification": {
"oneOf": [
{
"$ref": "#/components/schemas/AddressChangeNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextDeleteNotification"
},
{
"$ref": "#/components/schemas/ApplicationContextUpdateNotification"
},
{
"$ref": "#/components/schemas/ApplicationLocationAvailabilityNotification"
}
],
"discriminator": {
"propertyName": "notificationType"
}
}
}, },
"example": { "example": {
"notification": {
"notificationType": "ApplicationContextDeleteNotification", "notificationType": "ApplicationContextDeleteNotification",
"contextId": "contextId123" "contextId": "contextId123"
} }
} }
} }
}
}
}, },
"responses": { "responses": {
"204": { "204": {
...@@ -207,15 +169,10 @@ ...@@ -207,15 +169,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"appContext": {
"$ref": "#/components/schemas/AppContext" "$ref": "#/components/schemas/AppContext"
} }
} }
} }
}
}
}, },
"parameters": [ "parameters": [
{ {
...@@ -285,15 +242,10 @@ ...@@ -285,15 +242,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"applicationLocationAvailability": {
"$ref": "#/components/schemas/ApplicationLocationAvailability" "$ref": "#/components/schemas/ApplicationLocationAvailability"
} }
} }
} }
}
}
}, },
"parameters": [], "parameters": [],
"responses": { "responses": {
...@@ -302,15 +254,10 @@ ...@@ -302,15 +254,10 @@
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object",
"properties": {
"applicationLocationAvailability": {
"$ref": "#/components/schemas/ApplicationLocationAvailability" "$ref": "#/components/schemas/ApplicationLocationAvailability"
} }
} }
} }
}
}
}, },
"400": { "400": {
"$ref": "#/components/responses/400" "$ref": "#/components/responses/400"
...@@ -336,66 +283,43 @@ ...@@ -336,66 +283,43 @@
"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",
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/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",
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/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",
"required": [
"problemDetails"
],
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/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",
"properties": {
"problemDetails": {
"$ref": "#/components/schemas/ProblemDetails" "$ref": "#/components/schemas/ProblemDetails"
} }
} }
} }
} }
}
}
}, },
"parameters": { "parameters": {
"Query.appName": { "Query.appName": {
...@@ -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,9 +39,6 @@ paths: ...@@ -39,9 +39,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
applicationList:
$ref: "#/components/schemas/ApplicationList" $ref: "#/components/schemas/ApplicationList"
400: 400:
$ref: "#/components/responses/400" $ref: "#/components/responses/400"
...@@ -64,9 +61,6 @@ paths: ...@@ -64,9 +61,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
appContext:
$ref: '#/components/schemas/AppContext' $ref: '#/components/schemas/AppContext'
parameters: [] parameters: []
responses: responses:
...@@ -75,9 +69,6 @@ paths: ...@@ -75,9 +69,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
appContext:
$ref: "#/components/schemas/AppContext" $ref: "#/components/schemas/AppContext"
400: 400:
$ref: '#/components/responses/400' $ref: '#/components/responses/400'
...@@ -100,18 +91,8 @@ paths: ...@@ -100,18 +91,8 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object $ref: '#/components/schemas/InlineNotification'
properties:
notification:
oneOf:
- $ref: '#/components/schemas/AddressChangeNotification'
- $ref: '#/components/schemas/ApplicationContextDeleteNotification'
- $ref: '#/components/schemas/ApplicationContextUpdateNotification'
- $ref: '#/components/schemas/ApplicationLocationAvailabilityNotification'
discriminator:
propertyName: notificationType
example: example:
notification:
notificationType: ApplicationContextDeleteNotification notificationType: ApplicationContextDeleteNotification
contextId: 'contextId123' contextId: 'contextId123'
responses: responses:
...@@ -130,9 +111,6 @@ paths: ...@@ -130,9 +111,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
appContext:
$ref: '#/components/schemas/AppContext' $ref: '#/components/schemas/AppContext'
parameters: parameters:
- $ref: '#/components/parameters/Path.contextId' - $ref: '#/components/parameters/Path.contextId'
...@@ -179,9 +157,6 @@ paths: ...@@ -179,9 +157,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
applicationLocationAvailability:
$ref: '#/components/schemas/ApplicationLocationAvailability' $ref: '#/components/schemas/ApplicationLocationAvailability'
parameters: [] parameters: []
responses: responses:
...@@ -190,9 +165,6 @@ paths: ...@@ -190,9 +165,6 @@ paths:
content: content:
application/json: application/json:
schema: schema:
type: object
properties:
applicationLocationAvailability:
$ref: "#/components/schemas/ApplicationLocationAvailability" $ref: "#/components/schemas/ApplicationLocationAvailability"
400: 400:
$ref: '#/components/responses/400' $ref: '#/components/responses/400'
...@@ -209,40 +181,26 @@ components: ...@@ -209,40 +181,26 @@ 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
properties:
problemDetails:
$ref: '#/components/schemas/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
properties:
problemDetails:
$ref: '#/components/schemas/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
required:
- problemDetails
properties:
problemDetails:
$ref: '#/components/schemas/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
properties:
problemDetails:
$ref: '#/components/schemas/ProblemDetails' $ref: '#/components/schemas/ProblemDetails'
parameters: parameters:
Query.appName: Query.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:
......
Supports Markdown
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