Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit 3341f0a

Browse files
author
Chris Tucker
authored
Merge pull request #2 from plantbreeding/brapi-server-v2
Update BI instance of brapi test server
2 parents 74bef68 + cefa17d commit 3341f0a

File tree

71 files changed

+7870
-6489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+7870
-6489
lines changed

src/main/java/io/swagger/api/core/ListsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.ListNewRequest;
1011
import io.swagger.model.core.ListResponse;
@@ -115,7 +116,7 @@ ResponseEntity<ListsListResponse> listsPost(@ApiParam(value = "") @Valid @Reques
115116
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
116117
@RequestMapping(value = "/search/lists", produces = { "application/json" }, consumes = {
117118
"application/json" }, method = RequestMethod.POST)
118-
ResponseEntity<ListsListResponse> searchListsPost(@ApiParam(value = "") @Valid @RequestBody ListSearchRequest body,
119+
ResponseEntity<? extends BrAPIResponse> searchListsPost(@ApiParam(value = "") @Valid @RequestBody ListSearchRequest body,
119120
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
120121

121122
@ApiOperation(value = "Get the results of a List search request", nickname = "searchListsSearchResultsDbIdGet", notes = "Advanced searching for the list resource. See Search Services for additional implementation details.", response = ListsListResponse.class, authorizations = {
@@ -127,7 +128,7 @@ ResponseEntity<ListsListResponse> searchListsPost(@ApiParam(value = "") @Valid @
127128
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
128129
@RequestMapping(value = "/search/lists/{searchResultsDbId}", produces = {
129130
"application/json" }, method = RequestMethod.GET)
130-
ResponseEntity<ListsListResponse> searchListsSearchResultsDbIdGet(
131+
ResponseEntity<? extends BrAPIResponse> searchListsSearchResultsDbIdGet(
131132
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
132133
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
133134
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/core/LocationsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.LocationListResponse;
1011
import io.swagger.model.core.LocationNewRequest;
@@ -91,7 +92,7 @@ ResponseEntity<LocationListResponse> locationsPost(
9192
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
9293
@RequestMapping(value = "/search/locations", produces = { "application/json" }, consumes = {
9394
"application/json" }, method = RequestMethod.POST)
94-
ResponseEntity<LocationListResponse> searchLocationsPost(
95+
ResponseEntity<? extends BrAPIResponse> searchLocationsPost(
9596
@ApiParam(value = "") @Valid @RequestBody LocationSearchRequest body,
9697
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
9798

@@ -104,7 +105,7 @@ ResponseEntity<LocationListResponse> searchLocationsPost(
104105
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
105106
@RequestMapping(value = "/search/locations/{searchResultsDbId}", produces = {
106107
"application/json" }, method = RequestMethod.GET)
107-
ResponseEntity<LocationListResponse> searchLocationsSearchResultsDbIdGet(
108+
ResponseEntity<? extends BrAPIResponse> searchLocationsSearchResultsDbIdGet(
108109
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
109110
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
110111
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/core/PeopleApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.PersonListResponse;
1011
import io.swagger.model.core.PersonNewRequest;
@@ -94,7 +95,7 @@ ResponseEntity<PersonListResponse> peoplePost(@ApiParam(value = "") @Valid @Requ
9495
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
9596
@RequestMapping(value = "/search/people", produces = { "application/json" }, consumes = {
9697
"application/json" }, method = RequestMethod.POST)
97-
ResponseEntity<PersonListResponse> searchPeoplePost(
98+
ResponseEntity<? extends BrAPIResponse> searchPeoplePost(
9899
@ApiParam(value = "") @Valid @RequestBody PersonSearchRequest body,
99100
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
100101

@@ -107,7 +108,7 @@ ResponseEntity<PersonListResponse> searchPeoplePost(
107108
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
108109
@RequestMapping(value = "/search/people/{searchResultsDbId}", produces = {
109110
"application/json" }, method = RequestMethod.GET)
110-
ResponseEntity<PersonListResponse> searchPeopleSearchResultsDbIdGet(
111+
ResponseEntity<? extends BrAPIResponse> searchPeopleSearchResultsDbIdGet(
111112
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
112113
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
113114
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/core/ProgramsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.ProgramListResponse;
1011
import io.swagger.model.core.ProgramNewRequest;
@@ -91,7 +92,7 @@ ResponseEntity<ProgramSingleResponse> programsProgramDbIdPut(
9192
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
9293
@RequestMapping(value = "/search/programs", produces = { "application/json" }, consumes = {
9394
"application/json" }, method = RequestMethod.POST)
94-
ResponseEntity<ProgramListResponse> searchProgramsPost(
95+
ResponseEntity<? extends BrAPIResponse> searchProgramsPost(
9596
@ApiParam(value = "") @Valid @RequestBody ProgramSearchRequest body,
9697
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
9798

@@ -105,7 +106,7 @@ ResponseEntity<ProgramListResponse> searchProgramsPost(
105106
@ApiResponse(code = 404, message = "Not Found", response = String.class) })
106107
@RequestMapping(value = "/search/programs/{searchResultsDbId}", produces = {
107108
"application/json" }, method = RequestMethod.GET)
108-
ResponseEntity<ProgramListResponse> searchProgramsSearchResultsDbIdGet(
109+
ResponseEntity<? extends BrAPIResponse> searchProgramsSearchResultsDbIdGet(
109110
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
110111
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
111112
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/core/StudiesApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.StudyListResponse;
1011
import io.swagger.model.core.StudyNewRequest;
@@ -103,7 +104,7 @@ ResponseEntity<StudySingleResponse> studiesStudyDbIdPut(
103104
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
104105
@RequestMapping(value = "/search/studies", produces = { "application/json" }, consumes = {
105106
"application/json" }, method = RequestMethod.POST)
106-
ResponseEntity<StudyListResponse> searchStudiesPost(
107+
ResponseEntity<? extends BrAPIResponse> searchStudiesPost(
107108
@ApiParam(value = "Study Search request") @Valid @RequestBody StudySearchRequest body,
108109
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
109110

@@ -117,7 +118,7 @@ ResponseEntity<StudyListResponse> searchStudiesPost(
117118
@ApiResponse(code = 404, message = "Not Found", response = String.class) })
118119
@RequestMapping(value = "/search/studies/{searchResultsDbId}", produces = {
119120
"application/json" }, method = RequestMethod.GET)
120-
ResponseEntity<StudyListResponse> searchStudiesSearchResultsDbIdGet(
121+
ResponseEntity<? extends BrAPIResponse> searchStudiesSearchResultsDbIdGet(
121122
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
122123
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
123124
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/core/TrialsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.core;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.core.TrialListResponse;
1011
import io.swagger.model.core.TrialNewRequest;
@@ -101,7 +102,7 @@ ResponseEntity<TrialSingleResponse> trialsTrialDbIdPut(
101102
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
102103
@RequestMapping(value = "/search/trials", produces = { "application/json" }, consumes = {
103104
"application/json" }, method = RequestMethod.POST)
104-
ResponseEntity<TrialListResponse> searchTrialsPost(
105+
ResponseEntity<? extends BrAPIResponse> searchTrialsPost(
105106
@ApiParam(value = "") @Valid @RequestBody TrialSearchRequest body,
106107
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
107108

@@ -115,7 +116,7 @@ ResponseEntity<TrialListResponse> searchTrialsPost(
115116
@ApiResponse(code = 404, message = "Not Found", response = String.class) })
116117
@RequestMapping(value = "/search/trials/{searchResultsDbId}", produces = {
117118
"application/json" }, method = RequestMethod.GET)
118-
ResponseEntity<TrialListResponse> searchTrialsSearchResultsDbIdGet(
119+
ResponseEntity<? extends BrAPIResponse> searchTrialsSearchResultsDbIdGet(
119120
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
120121
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
121122
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/geno/CallSetsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.geno;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.geno.CallSetResponse;
1011
import io.swagger.model.geno.CallSetsListResponse;
@@ -83,7 +84,7 @@ ResponseEntity<CallSetsListResponse> callsetsGet(
8384
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
8485
@RequestMapping(value = "/search/callsets", produces = { "application/json" }, consumes = {
8586
"application/json" }, method = RequestMethod.POST)
86-
ResponseEntity<CallSetsListResponse> searchCallsetsPost(
87+
ResponseEntity<? extends BrAPIResponse> searchCallsetsPost(
8788
@ApiParam(value = "Study Search request") @Valid @RequestBody CallSetsSearchRequest body,
8889
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
8990

@@ -96,7 +97,7 @@ ResponseEntity<CallSetsListResponse> searchCallsetsPost(
9697
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
9798
@RequestMapping(value = "/search/callsets/{searchResultsDbId}", produces = {
9899
"application/json" }, method = RequestMethod.GET)
99-
ResponseEntity<CallSetsListResponse> searchCallsetsSearchResultsDbIdGet(
100+
ResponseEntity<? extends BrAPIResponse> searchCallsetsSearchResultsDbIdGet(
100101
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
101102
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
102103
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/geno/CallsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.geno;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.geno.CallsListResponse;
1011
import io.swagger.model.geno.CallsSearchRequest;
@@ -54,7 +55,7 @@ ResponseEntity<CallsListResponse> callsGet(
5455
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
5556
@RequestMapping(value = "/search/calls", produces = { "application/json" }, consumes = {
5657
"application/json" }, method = RequestMethod.POST)
57-
ResponseEntity<CallsListResponse> searchCallsPost(
58+
ResponseEntity<? extends BrAPIResponse> searchCallsPost(
5859
@ApiParam(value = "Study Search request") @Valid @RequestBody CallsSearchRequest body,
5960
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
6061
throws BrAPIServerException;
@@ -68,7 +69,7 @@ ResponseEntity<CallsListResponse> searchCallsPost(
6869
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
6970
@RequestMapping(value = "/search/calls/{searchResultsDbId}", produces = {
7071
"application/json" }, method = RequestMethod.GET)
71-
ResponseEntity<CallsListResponse> searchCallsSearchResultsDbIdGet(
72+
ResponseEntity<? extends BrAPIResponse> searchCallsSearchResultsDbIdGet(
7273
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
7374
@ApiParam(value = "Used to request a specific page of data to be returned. Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ") @Valid @RequestParam(value = "pageToken", required = false) String pageToken,
7475
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/geno/MarkerPositionsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.geno;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.geno.MarkerPositionsListResponse;
1011
import io.swagger.model.geno.MarkerPositionSearchRequest;
@@ -52,7 +53,7 @@ ResponseEntity<MarkerPositionsListResponse> markerpositionsGet(
5253
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
5354
@RequestMapping(value = "/search/markerpositions", produces = { "application/json" }, consumes = {
5455
"application/json" }, method = RequestMethod.POST)
55-
ResponseEntity<MarkerPositionsListResponse> searchMarkerpositionsPost(
56+
ResponseEntity<? extends BrAPIResponse> searchMarkerpositionsPost(
5657
@ApiParam(value = "") @Valid @RequestBody MarkerPositionSearchRequest body,
5758
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
5859
throws BrAPIServerException;
@@ -66,7 +67,7 @@ ResponseEntity<MarkerPositionsListResponse> searchMarkerpositionsPost(
6667
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
6768
@RequestMapping(value = "/search/markerpositions/{searchResultsDbId}", produces = {
6869
"application/json" }, method = RequestMethod.GET)
69-
ResponseEntity<MarkerPositionsListResponse> searchMarkerpositionsSearchResultsDbIdGet(
70+
ResponseEntity<? extends BrAPIResponse> searchMarkerpositionsSearchResultsDbIdGet(
7071
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
7172
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
7273
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

src/main/java/io/swagger/api/geno/ReferenceSetsApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package io.swagger.api.geno;
77

8+
import io.swagger.model.BrAPIResponse;
89
import io.swagger.model.Model202AcceptedSearchResponse;
910
import io.swagger.model.geno.ReferenceSetsListResponse;
1011
import io.swagger.model.geno.ReferenceSetsSearchRequest;
@@ -61,7 +62,7 @@ ResponseEntity<ReferenceSetsSingleResponse> referenceSetsReferenceSetDbIdGet(
6162
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
6263
@RequestMapping(value = "/search/referencesets", produces = { "application/json" }, consumes = {
6364
"application/json" }, method = RequestMethod.POST)
64-
ResponseEntity<ReferenceSetsListResponse> searchReferenceSetsPost(
65+
ResponseEntity<? extends BrAPIResponse> searchReferenceSetsPost(
6566
@ApiParam(value = "", required = true) @Valid @RequestBody ReferenceSetsSearchRequest body,
6667
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
6768

@@ -74,7 +75,7 @@ ResponseEntity<ReferenceSetsListResponse> searchReferenceSetsPost(
7475
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
7576
@RequestMapping(value = "/search/referencesets/{searchResultsDbId}", produces = {
7677
"application/json" }, method = RequestMethod.GET)
77-
ResponseEntity<ReferenceSetsListResponse> searchReferenceSetsSearchResultsDbIdGet(
78+
ResponseEntity<? extends BrAPIResponse> searchReferenceSetsSearchResultsDbIdGet(
7879
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
7980
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
8081
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,

0 commit comments

Comments
 (0)