add exclude,include for consistency. more text replacements. #522

opencb · Feb 4, 2020 · 547871f · 547871f
1 parent bae0083
commit 547871f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/feature/ProteinWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/feature/ProteinWSServer.java
@@ -160,8 +160,20 @@ public Response getSubstitutionScores(@PathParam("proteinId")
                                           @ApiParam(name = "proteinId",
                                                   value = "String indicating one xref id, e.g.: Q9UL59, Exact text "
                                                           + "matches will be returned",
-                                                  required = true) String id) {
+                                                  required = true) String id,
+                                          @QueryParam("exclude")
+                                          @ApiParam(value = ParamConstants.EXCLUDE_DESCRIPTION) String exclude,
+                                          @QueryParam("include")
+                                              @ApiParam(value = ParamConstants.INCLUDE_DESCRIPTION) String include,
+                                          @QueryParam("sort")
+                                              @ApiParam(value = ParamConstants.SORT_DESCRIPTION) String sort,
+                                          @QueryParam("limit") @DefaultValue("10")
+                                              @ApiParam(value = ParamConstants.LIMIT_DESCRIPTION) Integer limit,
+                                          @QueryParam("skip") @DefaultValue("0")
+                                              @ApiParam(value = ParamConstants.SKIP_DESCRIPTION)  Integer skip) {
         try {
+            parseIncludesAndExcludes(exclude, include, sort);
+            parseLimitAndSkip(limit, skip);
             parseQueryParams();
 
             // Fetch Ensembl transcriptId to query substiturion scores

diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/genomic/RegionWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/rest/genomic/RegionWSServer.java
@@ -263,8 +263,7 @@ public Response getTranscriptByRegion(@PathParam("chrRegionId") @ApiParam(name =
             responseContainer = "QueryResponse")
     public Response getRepeatByRegion(@PathParam("chrRegionId")
                                           @ApiParam(name = "chrRegionId",
-                                                  value = "comma-separated list of genomic regions to be queried, "
-                                                          + "e.g. 1:11869-14412", required = true) String region) {
+                                                  value = ParamConstants.REGION_DESCRIPTION, required = true) String region) {
         try {
             parseQueryParams();
             RepeatsDBAdaptor repeatsDBAdaptor = dbAdaptorFactory.getRepeatsDBAdaptor(this.species, this.assembly);