collections response new prototypes cleanup

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
ga4gh-beacon · Mar 25, 2024 · ad0c631 · ad0c631
1 parent ceaddd4
commit ad0c631
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/models/json/beacon-v2-default-model/datasets/endpoints.json b/models/json/beacon-v2-default-model/datasets/endpoints.json
@@ -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"
                                 }
                             ]
                         }

diff --git a/models/src/beacon-v2-default-model/cohorts/endpoints.yaml b/models/src/beacon-v2-default-model/cohorts/endpoints.yaml
@@ -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
@@ -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

diff --git a/models/src/beacon-v2-default-model/datasets/endpoints.yaml b/models/src/beacon-v2-default-model/datasets/endpoints.yaml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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