From 158273cfdc0d0e142c554a420c2f70e3c2525129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20FENOY?= Date: Fri, 24 Sep 2021 10:52:07 +0200 Subject: [PATCH 1/6] Add nullable: false This should ensure that the null value cannot be used --- core/openapi/schemas/statusCode.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/openapi/schemas/statusCode.yaml b/core/openapi/schemas/statusCode.yaml index 3d7b717e..f30262c9 100644 --- a/core/openapi/schemas/statusCode.yaml +++ b/core/openapi/schemas/statusCode.yaml @@ -1,4 +1,5 @@ type: string +nullable: false enum: - accepted - running From c43ecc049ed5cf59a1f2a2d5b74b0754b02f473d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Fenoy?= Date: Thu, 28 Oct 2021 11:46:31 +0200 Subject: [PATCH 2/6] Add the missing type key The Abstract Test 75 Test Method mention the following: "Inspect the value of the type property for each job listed in the response.". It means that this schema should define the `type` key. --- core/openapi/schemas/statusInfo.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/openapi/schemas/statusInfo.yaml b/core/openapi/schemas/statusInfo.yaml index 24e6e707..98dead41 100644 --- a/core/openapi/schemas/statusInfo.yaml +++ b/core/openapi/schemas/statusInfo.yaml @@ -5,6 +5,10 @@ required: properties: processID: type: string + type: + type: string + enum: + - process jobID: type: string status: From 897175bfb8d1a2296120b0f2149a049ba43a961b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Fenoy?= Date: Thu, 28 Oct 2021 12:02:45 +0200 Subject: [PATCH 3/6] Simplification same meaning --- core/openapi/schemas/results.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/openapi/schemas/results.yaml b/core/openapi/schemas/results.yaml index af7a8f2b..97a9a867 100644 --- a/core/openapi/schemas/results.yaml +++ b/core/openapi/schemas/results.yaml @@ -1,3 +1,2 @@ additionalProperties: - oneOf: - - $ref: "inlineOrRefData.yaml" + $ref: "inlineOrRefData.yaml" From 58982c4b2cb034db963fc51392a4ed0356cd701c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Fenoy?= Date: Thu, 28 Oct 2021 15:51:53 +0200 Subject: [PATCH 4/6] Typo --- core/requirements/job-list/REQ_type-response.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements/job-list/REQ_type-response.adoc b/core/requirements/job-list/REQ_type-response.adoc index f62500a5..d139dc8e 100644 --- a/core/requirements/job-list/REQ_type-response.adoc +++ b/core/requirements/job-list/REQ_type-response.adoc @@ -4,5 +4,5 @@ [%metadata] label:: /req/job-list/type-response part:: If the parameter is provided and its value is `process` then only jobs created by an OGC processes API SHALL be included in the response. -part:: The the parameter is omitted, than all jobs SHALL be included in the response. +part:: If the parameter is omitted, then all jobs SHALL be included in the response. ==== From 304b0e48ce9de8793ac581d4ee41863ba74a0499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Fenoy?= Date: Thu, 28 Oct 2021 15:56:10 +0200 Subject: [PATCH 5/6] Make both processID and type required properties --- core/openapi/schemas/statusInfo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/openapi/schemas/statusInfo.yaml b/core/openapi/schemas/statusInfo.yaml index 98dead41..4e113683 100644 --- a/core/openapi/schemas/statusInfo.yaml +++ b/core/openapi/schemas/statusInfo.yaml @@ -2,6 +2,8 @@ type: object required: - jobID - status + - processID + - type properties: processID: type: string From fb567f516a055ddc887aec4bd54ca30d5e8d3bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Fenoy?= Date: Thu, 4 Nov 2021 14:03:07 +0100 Subject: [PATCH 6/6] processID is optional From https://docs.ogc.org/DRAFTS/18-062.html#_parameter_processid we have the following: > If the server supports this conformance class, the optional processID property in the statusInfo.yaml schema SHALL be mandatory. In case the server does not support this conformance class, then the processID become optional. So, generally it is optional. Thanks a lot to @pvretano for clarification. --- core/openapi/schemas/statusInfo.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/openapi/schemas/statusInfo.yaml b/core/openapi/schemas/statusInfo.yaml index 4e113683..0649d310 100644 --- a/core/openapi/schemas/statusInfo.yaml +++ b/core/openapi/schemas/statusInfo.yaml @@ -2,7 +2,6 @@ type: object required: - jobID - status - - processID - type properties: processID: