diff --git a/specs/composition/common/schemas/SearchParams.yml b/specs/composition/common/schemas/SearchParams.yml index 42b4171585b..001b338ac5d 100644 --- a/specs/composition/common/schemas/SearchParams.yml +++ b/specs/composition/common/schemas/SearchParams.yml @@ -1,4 +1,4 @@ -searchParams: +params: title: Composition Search parameters as object type: object additionalProperties: false diff --git a/specs/composition/paths/search/run.yml b/specs/composition/paths/search/search.yml similarity index 77% rename from specs/composition/paths/search/run.yml rename to specs/composition/paths/search/search.yml index e1aed1a40a4..317715ef48a 100644 --- a/specs/composition/paths/search/run.yml +++ b/specs/composition/paths/search/search.yml @@ -1,7 +1,7 @@ post: tags: - Search - operationId: runSingleComposition + operationId: search x-use-read-transporter: true x-cacheable: true x-acl: @@ -11,10 +11,16 @@ post: parameters: - $ref: '../../common/parameters.yml#/compositionID' requestBody: + required: true content: application/json: schema: - $ref: '../../../common/schemas/SearchParams.yml#/searchParams' + title: requestBody + type: object + additionalProperties: false + properties: + params: + $ref: '../../common/schemas/SearchParams.yml#/params' responses: '200': description: OK diff --git a/specs/composition/paths/search/searchForFacetValues.yml b/specs/composition/paths/search/searchForFacetValues.yml index e7ade059273..191d2ffc8b7 100644 --- a/specs/composition/paths/search/searchForFacetValues.yml +++ b/specs/composition/paths/search/searchForFacetValues.yml @@ -41,7 +41,7 @@ post: maxFacetHits: $ref: '../../../common/schemas/IndexSettings.yml#/maxFacetHits' searchQuery: - $ref: '../../common/schemas/SearchParams.yml#/searchParams' + $ref: '../../common/schemas/SearchParams.yml#/params' responses: '200': description: OK diff --git a/specs/composition/spec.yml b/specs/composition/spec.yml index eb9a6f6d4b0..65553cf1e46 100644 --- a/specs/composition/spec.yml +++ b/specs/composition/spec.yml @@ -57,7 +57,7 @@ paths: # ### Search Endpoints ### # ######################## /1/compositions/{compositionID}/run: - $ref: 'paths/search/run.yml' + $ref: 'paths/search/search.yml' /1/compositions/{compositionID}/facets/{facetName}/query: $ref: 'paths/search/searchForFacetValues.yml' diff --git a/tests/CTS/requests/composition/runSingleComposition.json b/tests/CTS/requests/composition/search.json similarity index 64% rename from tests/CTS/requests/composition/runSingleComposition.json rename to tests/CTS/requests/composition/search.json index 7d35bfb327d..e8be0dcbf2f 100644 --- a/tests/CTS/requests/composition/runSingleComposition.json +++ b/tests/CTS/requests/composition/search.json @@ -2,15 +2,15 @@ { "parameters": { "compositionID": "foo", - "searchParams": { - "query": "batman" + "requestBody": { + "params": { "query": "batman" } } }, "request": { "path": "/1/compositions/foo/run", "method": "POST", "body": { - "query": "batman" + "params": { "query": "batman" } } } }