Skip to content

Commit

Permalink
collections response new prototypes cleanup
Browse files Browse the repository at this point in the history
This fixes the wrong response for some of teh collections endpoints and changes the (definitely now) ambiguous ResultsOKResponse to the correct instances of

* CollectionsResponse
* ResultsetsResponse
  • Loading branch information
mbaudis committed Mar 25, 2024
1 parent ceaddd4 commit ad0c631
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
},
{
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultSetsResponse.json"
"$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions models/src/beacon-v2-default-model/cohorts/endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ paths:
- GET Endpoints
responses:
'200':
$ref: '#/components/responses/ResultsOKResponse'
$ref: '#/components/responses/CollectionsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -77,7 +77,7 @@ paths:
required: true
responses:
'200':
$ref: '#/components/responses/ResultsOKResponse'
$ref: '#/components/responses/CollectionsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand Down
20 changes: 10 additions & 10 deletions models/src/beacon-v2-default-model/datasets/endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ paths:
- GET Endpoints
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -114,7 +114,7 @@ paths:
required: true
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -133,7 +133,7 @@ paths:
- GET Endpoints
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -151,7 +151,7 @@ paths:
required: true
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -170,7 +170,7 @@ paths:
- GET Endpoints
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand All @@ -188,7 +188,7 @@ paths:
required: true
responses:
'200':
$ref: '#/components/responses/ResultSetsResponse'
$ref: '#/components/responses/ResultsetsResponse'
default:
description: An unsuccessful operation
$ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json
Expand Down Expand Up @@ -239,23 +239,23 @@ paths:
components:
responses:
CollectionsResponse:
description: Successful operation.
description: Successful collection operation.
content:
application/json:
schema:
oneOf:
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCollectionsResponse.json
ResultSetsResponse:
description: Successful resultset list operation.
ResultsetsResponse:
description: Successful resultset operation.
content:
application/json:
schema:
oneOf:
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultSetsResponse.json
- $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json
parameters:
requestedSchema:
name: requestedSchema
Expand Down

0 comments on commit ad0c631

Please sign in to comment.