diff --git a/src/main/java/org/breedinginsight/brapi/v2/StudyController.java b/src/main/java/org/breedinginsight/brapi/v2/StudyController.java index 27a9033aa..5edfb7939 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/StudyController.java +++ b/src/main/java/org/breedinginsight/brapi/v2/StudyController.java @@ -46,7 +46,7 @@ public StudyController(BrAPIStudyService studyService, StudyQueryMapper studyQue @Get("/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/studies{?queryParams*}") @Produces(MediaType.APPLICATION_JSON) @ProgramSecured(roleGroups = {ProgramSecuredRoleGroup.ALL}) - public HttpResponse>>> getStudy( + public HttpResponse>>> getStudies( @PathVariable("programId") UUID programId, @QueryValue @QueryValid(using = StudyQueryMapper.class) @Valid StudyQuery queryParams) { try { diff --git a/src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java b/src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java index 53ec5d5b0..f171f7652 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java +++ b/src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java @@ -163,36 +163,4 @@ private Map processStudyForDisplay(List programSt return programStudyMap; } - public BrAPIStudy getStudyByUUID(String studyId, UUID programId) throws ApiException, DoesNotExistException { - Map cache = programStudyCache.get(programId); - BrAPIStudy study = null; - if (cache != null) { - study = cache.get(studyId); - } - if (study == null) { - throw new DoesNotExistException("UUID for this study does not exist"); - } - return study; - } - - public Optional getStudyByDBID(String studyDbId, UUID programId) throws ApiException { - Map cache = programStudyCache.get(programId); - //key is UUID, want to filter by DBID - BrAPIStudy study = null; - if (cache != null) { - study = cache.values().stream().filter(x -> x.getStudyDbId().equals(studyDbId)).collect(Collectors.toList()).get(0); - } - return Optional.ofNullable(study); - } - - public List getStudiesByDBID(Collection studyDbIds, UUID programId) throws ApiException { - Map cache = programStudyCache.get(programId); - //key is UUID, want to filter by DBID - List studies = new ArrayList<>(); - if (cache != null) { - studies = cache.values().stream().filter(x -> studyDbIds.contains(x.getStudyDbId())).collect(Collectors.toList()); - } - return studies; - } - } diff --git a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIStudyService.java b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIStudyService.java index 08d94d7b8..6e1e6281f 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIStudyService.java +++ b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIStudyService.java @@ -22,7 +22,6 @@ import org.brapi.client.v2.model.exceptions.ApiException; import org.brapi.v2.model.core.BrAPIStudy; import org.breedinginsight.brapi.v2.dao.BrAPIStudyDAO; -import org.breedinginsight.services.exceptions.DoesNotExistException; import javax.inject.Inject; import javax.inject.Singleton; @@ -48,12 +47,4 @@ public List getStudies(UUID programId) throws ApiException { } } - public BrAPIStudy getStudyByUUID(UUID programId, String studyId) throws DoesNotExistException { - try { - return studyDAO.getStudyByUUID(studyId, programId); - } catch (ApiException e) { - throw new InternalServerException(e.getMessage(), e); - } - } - }