From 76eef6f17ce1c4ad398129ba2d8a62fa1a7262b9 Mon Sep 17 00:00:00 2001 From: pfurio Date: Fri, 1 Dec 2023 15:00:42 +0100 Subject: [PATCH 01/16] catalog: update report with actions, #TASK-5349 --- .../db/api/ClinicalAnalysisDBAdaptor.java | 8 + .../ClinicalAnalysisMongoDBAdaptor.java | 88 ++++++++++- .../catalog/db/mongodb/MongoDBUtils.java | 15 +- .../converters/ClinicalAnalysisConverter.java | 10 +- .../managers/ClinicalAnalysisManager.java | 87 ++++++++++- .../managers/ClinicalAnalysisManagerTest.java | 145 ++++++++++++++++++ .../rest/analysis/ClinicalWebService.java | 45 ++++++ 7 files changed, 384 insertions(+), 14 deletions(-) diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/api/ClinicalAnalysisDBAdaptor.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/api/ClinicalAnalysisDBAdaptor.java index a4b3d8f19b4..9ba04a571c1 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/api/ClinicalAnalysisDBAdaptor.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/api/ClinicalAnalysisDBAdaptor.java @@ -73,6 +73,7 @@ enum QueryParams implements QueryParam { ANALYSTS_ID("analysts.id", TEXT, ""), ANALYSTS_ASSIGNED_BY("analysts.assignedBy", TEXT, ""), REPORT("report", OBJECT, ""), + REPORT_UPDATE("report_update", OBJECT, ""), // Made up key to be able to set inner fields and not the entire object REPORT_SUPPORTING_EVIDENCES("report.supportingEvidences", TEXT_ARRAY, ""), REPORT_FILES("report.files", TEXT_ARRAY, ""), REQUEST("request", OBJECT, ""), @@ -165,6 +166,13 @@ public static QueryParams getParam(String key) { } enum ReportQueryParams implements QueryParam { + TITLE("title", STRING, ""), + OVERVIEW("overview", STRING, ""), + DISCUSSION("discussion", OBJECT, ""), + LOGO("logo", STRING, ""), + SIGNED_BY("signedBy", STRING, ""), + SIGNATURE("signature", STRING, ""), + DATE("date", STRING, ""), COMMENTS("comments", OBJECT, ""), SUPPORTING_EVIDENCES("supportingEvidences", TEXT_ARRAY, ""), FILES("files", TEXT_ARRAY, ""); diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java index 996a7eaac48..c0ea18866a4 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java @@ -142,18 +142,18 @@ static void fixPanelsForRemoval(ObjectMap parameters) { parameters.put(PANELS.key(), panelParamList); } - static void fixFilesForRemoval(ObjectMap parameters) { - if (parameters.get(FILES.key()) == null) { + static void fixFilesForRemoval(ObjectMap parameters, String key) { + if (parameters.get(key) == null) { return; } List fileParamList = new LinkedList<>(); - for (Object file : parameters.getAsList(FILES.key())) { + for (Object file : parameters.getAsList(key)) { if (file instanceof File) { fileParamList.add(new Document("uid", ((File) file).getUid())); } } - parameters.put(FILES.key(), fileParamList); + parameters.put(key, fileParamList); } static void fixAnalystsForRemoval(ObjectMap parameters) { @@ -410,13 +410,87 @@ UpdateDocument parseAndValidateUpdateParams(ObjectMap parameters, List actionMap = queryOptions.getMap(Constants.ACTIONS, new HashMap<>()); + + if (parameters.containsKey(REPORT_UPDATE.key())) { + ObjectMap reportParameters = parameters.getNestedMap(REPORT_UPDATE.key()); + reportParameters.put(ReportQueryParams.DATE.key(), TimeUtils.getTime()); + String[] stringParams = {ReportQueryParams.TITLE.key(), ReportQueryParams.OVERVIEW.key(), ReportQueryParams.LOGO.key(), + ReportQueryParams.SIGNED_BY.key(), ReportQueryParams.SIGNATURE.key(), ReportQueryParams.DATE.key(), }; + filterStringParams(reportParameters, document.getSet(), stringParams, REPORT.key() + "."); + + String[] objectParams = {ReportQueryParams.DISCUSSION.key()}; + filterObjectParams(reportParameters, document.getSet(), objectParams, REPORT.key() + "."); + + String[] commentParams = {ReportQueryParams.COMMENTS.key()}; + ParamUtils.AddRemoveReplaceAction basicOperation = ParamUtils.AddRemoveReplaceAction + .from(actionMap, ReportQueryParams.COMMENTS.key(), ParamUtils.AddRemoveReplaceAction.ADD); + switch (basicOperation) { + case REMOVE: + fixCommentsForRemoval(reportParameters); + filterObjectParams(reportParameters, document.getPull(), commentParams, REPORT.key() + "."); + break; + case ADD: + filterObjectParams(reportParameters, document.getAddToSet(), commentParams, REPORT.key() + "."); + break; + case REPLACE: + filterReplaceParams(reportParameters.getAsList(ReportQueryParams.COMMENTS.key(), ClinicalComment.class), document, + ClinicalComment::getDate, QueryParams.REPORT.key() + "." + QueryParams.COMMENTS_DATE.key()); + break; + default: + throw new IllegalStateException("Unknown operation " + basicOperation); + } + + String[] filesParams = new String[]{ReportQueryParams.FILES.key()}; + ParamUtils.BasicUpdateAction operation = ParamUtils.BasicUpdateAction.from(actionMap, ReportQueryParams.FILES.key(), + ParamUtils.BasicUpdateAction.ADD); + switch (operation) { + case SET: + filterObjectParams(reportParameters, document.getSet(), filesParams, QueryParams.REPORT.key() + "."); + clinicalConverter.validateFilesToUpdate(document.getSet(), QueryParams.REPORT.key() + "." + + ReportQueryParams.FILES.key()); + break; + case REMOVE: + fixFilesForRemoval(reportParameters, ReportQueryParams.FILES.key()); + filterObjectParams(reportParameters, document.getPull(), filesParams, QueryParams.REPORT.key() + "."); + break; + case ADD: + filterObjectParams(reportParameters, document.getAddToSet(), filesParams, QueryParams.REPORT.key() + "."); + clinicalConverter.validateFilesToUpdate(document.getAddToSet(), QueryParams.REPORT.key() + "." + + ReportQueryParams.FILES.key()); + break; + default: + throw new IllegalStateException("Unknown operation " + basicOperation); + } + + String[] supportingEvidencesParams = new String[]{ReportQueryParams.SUPPORTING_EVIDENCES.key()}; + operation = ParamUtils.BasicUpdateAction.from(actionMap, ReportQueryParams.SUPPORTING_EVIDENCES.key(), + ParamUtils.BasicUpdateAction.ADD); + switch (operation) { + case SET: + filterObjectParams(reportParameters, document.getSet(), supportingEvidencesParams, QueryParams.REPORT.key() + "."); + clinicalConverter.validateFilesToUpdate(document.getSet(), QueryParams.REPORT.key() + "." + + ReportQueryParams.SUPPORTING_EVIDENCES.key()); + break; + case REMOVE: + fixFilesForRemoval(reportParameters, ReportQueryParams.SUPPORTING_EVIDENCES.key()); + filterObjectParams(reportParameters, document.getPull(), supportingEvidencesParams, QueryParams.REPORT.key() + "."); + break; + case ADD: + filterObjectParams(reportParameters, document.getAddToSet(), supportingEvidencesParams, QueryParams.REPORT.key() + "."); + clinicalConverter.validateFilesToUpdate(document.getAddToSet(), QueryParams.REPORT.key() + "." + + ReportQueryParams.SUPPORTING_EVIDENCES.key()); + break; + default: + throw new IllegalStateException("Unknown operation " + basicOperation); + } + } + clinicalConverter.validateInterpretationToUpdate(document.getSet()); clinicalConverter.validateFamilyToUpdate(document.getSet()); clinicalConverter.validateProbandToUpdate(document.getSet()); clinicalConverter.validateReportToUpdate(document.getSet()); - Map actionMap = queryOptions.getMap(Constants.ACTIONS, new HashMap<>()); - String[] objectAcceptedParams = new String[]{QueryParams.COMMENTS.key()}; ParamUtils.AddRemoveReplaceAction basicOperation = ParamUtils.AddRemoveReplaceAction.from(actionMap, QueryParams.COMMENTS.key(), ParamUtils.AddRemoveReplaceAction.ADD); @@ -463,7 +537,7 @@ UpdateDocument parseAndValidateUpdateParams(ObjectMap parameters, List filter } static void filterStringParams(ObjectMap parameters, Map filteredParams, String[] acceptedParams) { + filterStringParams(parameters, filteredParams, acceptedParams, ""); + } + + static void filterStringParams(ObjectMap parameters, Map filteredParams, String[] acceptedParams, String dbKeyPrefix) { for (String s : acceptedParams) { if (parameters.containsKey(s)) { - filteredParams.put(s, parameters.getString(s)); + filteredParams.put(dbKeyPrefix + s, parameters.getString(s)); } } } @@ -361,6 +365,11 @@ static void filterMapParams(ObjectMap parameters, Map filteredPa } static void filterObjectParams(ObjectMap parameters, Map filteredParams, String[] acceptedMapParams) { + filterObjectParams(parameters, filteredParams, acceptedMapParams, ""); + } + + static void filterObjectParams(ObjectMap parameters, Map filteredParams, String[] acceptedMapParams, + String dbKeyPrefix) { for (String s : acceptedMapParams) { if (parameters.containsKey(s)) { Document document; @@ -371,10 +380,10 @@ static void filterObjectParams(ObjectMap parameters, Map filtere for (Object object : originalList) { documentList.add(getMongoDBDocument(object, s)); } - filteredParams.put(s, documentList); + filteredParams.put(dbKeyPrefix + s, documentList); } else { document = getMongoDBDocument(parameters.get(s), s); - filteredParams.put(s, document); + filteredParams.put(dbKeyPrefix + s, document); } } catch (CatalogDBException e) { logger.warn("Skipping key '" + s + "': " + e.getMessage(), e); diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/converters/ClinicalAnalysisConverter.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/converters/ClinicalAnalysisConverter.java index 45fff9dd2f3..ed7494ae2c9 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/converters/ClinicalAnalysisConverter.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/converters/ClinicalAnalysisConverter.java @@ -156,10 +156,14 @@ public void validatePanelsToUpdate(Document document) { } } - public void validateFilesToUpdate(Document document) { - List files = (List) document.get(ClinicalAnalysisDBAdaptor.QueryParams.FILES.key()); + public void validateFilesToUpdate(Document document, String key) { + List files = (List) document.get(key); List reducedFiles = getReducedFileDocuments(files); - document.put(ClinicalAnalysisDBAdaptor.QueryParams.FILES.key(), reducedFiles); + document.put(key, reducedFiles); + } + + public void validateFilesToUpdate(Document document) { + validateFilesToUpdate(document, ClinicalAnalysisDBAdaptor.QueryParams.FILES.key()); } private static List getReducedFileDocuments(List files) { diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java index 13be28039cc..7d22001ea66 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java @@ -37,7 +37,10 @@ import org.opencb.opencga.catalog.exceptions.CatalogException; import org.opencb.opencga.catalog.exceptions.CatalogParameterException; import org.opencb.opencga.catalog.models.InternalGetDataResult; -import org.opencb.opencga.catalog.utils.*; +import org.opencb.opencga.catalog.utils.AnnotationUtils; +import org.opencb.opencga.catalog.utils.Constants; +import org.opencb.opencga.catalog.utils.ParamUtils; +import org.opencb.opencga.catalog.utils.UuidUtils; import org.opencb.opencga.core.api.ParamConstants; import org.opencb.opencga.core.common.JacksonUtils; import org.opencb.opencga.core.common.TimeUtils; @@ -1688,6 +1691,88 @@ private OpenCGAResult update(Study study, ClinicalAnalysis cli return update; } + public OpenCGAResult updateReport(String studyStr, String clinicalAnalysisId, ClinicalReport report, + QueryOptions options, String token) throws CatalogException { + String userId = userManager.getUserId(token); + Study study = studyManager.resolveId(studyStr, userId); + + String operationId = UuidUtils.generateOpenCgaUuid(UuidUtils.Entity.AUDIT); + + ObjectMap auditParams = new ObjectMap() + .append("study", studyStr) + .append("clinicalAnalysisId", clinicalAnalysisId) + .append("report", report) + .append("options", options) + .append("token", token); + + String caseId = clinicalAnalysisId; + String caseUuid = ""; + try { + options = ParamUtils.defaultObject(options, QueryOptions::new); + ClinicalAnalysis clinicalAnalysis = internalGet(study.getUid(), clinicalAnalysisId, INCLUDE_CLINICAL_IDS, userId).first(); + authorizationManager.checkClinicalAnalysisPermission(study.getUid(), clinicalAnalysis.getUid(), userId, + ClinicalAnalysisPermissions.WRITE); + caseId = clinicalAnalysis.getId(); + caseUuid = clinicalAnalysis.getUuid(); + + ObjectMap updateMap; + try { + updateMap = new ObjectMap(getUpdateObjectMapper().writeValueAsString(report)); + } catch (JsonProcessingException e) { + throw new CatalogException("Could not parse report object: " + e.getMessage(), e); + } + + Map actionMap = options.getMap(ParamConstants.ACTION, new HashMap<>()); + if (report.getComments() != null) { + ParamUtils.AddRemoveReplaceAction basicOperation = ParamUtils.AddRemoveReplaceAction + .from(actionMap, ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), ParamUtils.AddRemoveReplaceAction.ADD); + if (basicOperation != ParamUtils.AddRemoveReplaceAction.ADD) { + for (ClinicalComment comment : report.getComments()) { + comment.setDate(TimeUtils.getTime()); + comment.setAuthor(userId); + } + } + updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), report.getComments()); + } + if (CollectionUtils.isNotEmpty(report.getFiles())) { + List files = obtainFiles(study, userId, report.getFiles()); + updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), files, false); + } + if (CollectionUtils.isNotEmpty(report.getSupportingEvidences())) { + List files = obtainFiles(study, userId, report.getSupportingEvidences()); + updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), files, false); + } + ClinicalAudit clinicalAudit = new ClinicalAudit(userId, ClinicalAudit.Action.UPDATE_CLINICAL_ANALYSIS, + "Update ClinicalAnalysis '" + clinicalAnalysis.getId() + "' report.", TimeUtils.getTime()); + + // Add custom key to ensure it is properly updated + updateMap = new ObjectMap(ClinicalAnalysisDBAdaptor.QueryParams.REPORT_UPDATE.key(), updateMap); + OpenCGAResult update = clinicalDBAdaptor.update(clinicalAnalysis.getUid(), updateMap, null, + Collections.singletonList(clinicalAudit), options); + auditManager.auditUpdate(operationId, userId, Enums.Resource.CLINICAL_ANALYSIS, caseId, caseUuid, study.getId(), + study.getUuid(), auditParams, new AuditRecord.Status(AuditRecord.Status.Result.SUCCESS)); + if (options.getBoolean(ParamConstants.INCLUDE_RESULT_PARAM)) { + // Fetch updated clinical analysis + OpenCGAResult result = clinicalDBAdaptor.get(study.getUid(), + new Query(ClinicalAnalysisDBAdaptor.QueryParams.UID.key(), clinicalAnalysis.getUid()), options, userId); + update.setResults(result.getResults()); + } + List reportList = new ArrayList<>(update.getResults().size()); + if (update.getNumResults() > 0) { + for (ClinicalAnalysis result : update.getResults()) { + reportList.add(result.getReport()); + } + } + return new OpenCGAResult<>(update.getTime(), update.getEvents(), update.getNumResults(), reportList, + update.getNumMatches(), update.getNumInserted(), update.getNumUpdated(), update.getNumDeleted(), + update.getNumErrors(), update.getAttributes(), update.getFederationNode()); + } catch (CatalogException e) { + auditManager.auditUpdate(operationId, userId, Enums.Resource.CLINICAL_ANALYSIS, caseId, caseUuid, study.getId(), + study.getUuid(), auditParams, new AuditRecord.Status(AuditRecord.Status.Result.ERROR, e.getError())); + throw e; + } + } + /** * Sort the family members in the following order: proband, father, mother, others. * diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java index e07d53338b9..c5b5fbc49ce 100644 --- a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java +++ b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java @@ -477,6 +477,151 @@ public void updateClinicalAnalysisReport() throws CatalogException { new ClinicalAnalysisUpdateParams().setReport(report), INCLUDE_RESULT, sessionIdUser); } + @Test + public void updateClinicalAnalysisReportWithActions() throws CatalogException { + ClinicalAnalysis case1 = createDummyEnvironment(true, true).first(); + assertNull(case1.getReport()); + + // Add files + catalogManager.getFileManager().create(STUDY, + new FileCreateParams() + .setContent(RandomStringUtils.randomAlphanumeric(1000)) + .setPath("/data/file1.txt") + .setType(File.Type.FILE), + true, sessionIdUser); + catalogManager.getFileManager().create(STUDY, + new FileCreateParams() + .setContent(RandomStringUtils.randomAlphanumeric(1000)) + .setPath("/data/file2.txt") + .setType(File.Type.FILE), + true, sessionIdUser); + catalogManager.getFileManager().create(STUDY, + new FileCreateParams() + .setContent(RandomStringUtils.randomAlphanumeric(1000)) + .setPath("/data/file3.txt") + .setType(File.Type.FILE), + true, sessionIdUser); + + ClinicalReport report = new ClinicalReport("title", "overview", new ClinicalDiscussion("me", TimeUtils.getTime(), "text"), "logo", + "me", "signature", TimeUtils.getTime(), Arrays.asList( + new ClinicalComment().setMessage("comment1"), + new ClinicalComment().setMessage("comment2") + ), + Collections.singletonList(new File().setId("data:file1.txt")), + Collections.singletonList(new File().setId("data:file2.txt"))); + OpenCGAResult result = catalogManager.getClinicalAnalysisManager().update(STUDY, case1.getId(), + new ClinicalAnalysisUpdateParams().setReport(report), INCLUDE_RESULT, sessionIdUser); + assertNotNull(result.first().getReport()); + assertEquals(report.getTitle(), result.first().getReport().getTitle()); + assertEquals(report.getOverview(), result.first().getReport().getOverview()); + assertEquals(report.getDate(), result.first().getReport().getDate()); + assertEquals(report.getLogo(), result.first().getReport().getLogo()); + assertEquals(report.getSignature(), result.first().getReport().getSignature()); + assertEquals(report.getSignedBy(), result.first().getReport().getSignedBy()); + assertEquals(2, result.first().getReport().getComments().size()); + assertEquals(1, result.first().getReport().getFiles().size()); + assertEquals(1, result.first().getReport().getSupportingEvidences().size()); + + // Add comment + // Set files + // Remove supporting evidence + ObjectMap actionMap = new ObjectMap() + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), ParamUtils.AddRemoveAction.ADD) + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), ParamUtils.BasicUpdateAction.SET) + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), ParamUtils.BasicUpdateAction.REMOVE); + QueryOptions options = new QueryOptions() + .append(Constants.ACTIONS, actionMap) + .append(ParamConstants.INCLUDE_RESULT_PARAM, true); + ClinicalReport reportToUpdate = new ClinicalReport() + .setComments(Collections.singletonList(new ClinicalComment().setMessage("comment3"))) + .setFiles(Arrays.asList( + new File().setId("data:file2.txt"), + new File().setId("data:file3.txt") + )) + .setSupportingEvidences(Collections.singletonList(new File().setId("data:file1.txt"))); + ClinicalReport reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, + options, sessionIdUser).first(); + // Check comments + assertEquals(3, reportResult.getComments().size()); + assertEquals("comment1", reportResult.getComments().get(0).getMessage()); + assertEquals("comment2", reportResult.getComments().get(1).getMessage()); + assertEquals("comment3", reportResult.getComments().get(2).getMessage()); + + // Check files + assertEquals(2, reportResult.getFiles().size()); + assertTrue(reportResult.getFiles().stream().map(File::getPath).collect(Collectors.toSet()).containsAll(Arrays.asList("data/file2.txt", "data/file3.txt"))); + + // Check supporting evidences + assertEquals(0, reportResult.getSupportingEvidences().size()); + + + // Remove comment + // Remove file + // Set supporting evidences + actionMap = new ObjectMap() + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), ParamUtils.AddRemoveAction.REMOVE) + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), ParamUtils.BasicUpdateAction.REMOVE) + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), ParamUtils.BasicUpdateAction.SET); + options = new QueryOptions() + .append(Constants.ACTIONS, actionMap) + .append(ParamConstants.INCLUDE_RESULT_PARAM, true); + reportToUpdate = new ClinicalReport() + .setComments(Arrays.asList(reportResult.getComments().get(0), reportResult.getComments().get(1))) + .setFiles(Collections.singletonList(new File().setId("data:file3.txt"))) + .setSupportingEvidences(Arrays.asList( + new File().setId("data:file1.txt"), + new File().setId("data:file3.txt") + )); + ClinicalComment pendingComment = reportResult.getComments().get(2); + reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, + options, sessionIdUser).first(); + // Check comments + assertEquals(1, reportResult.getComments().size()); + assertEquals(pendingComment.getMessage(), reportResult.getComments().get(0).getMessage()); + + // Check supporting evidences + assertEquals(2, reportResult.getSupportingEvidences().size()); + assertTrue(reportResult.getSupportingEvidences().stream().map(File::getPath).collect(Collectors.toSet()) + .containsAll(Arrays.asList("data/file1.txt", "data/file3.txt"))); + + // Check files + assertEquals(1, reportResult.getFiles().size()); + assertEquals("data/file2.txt", reportResult.getFiles().get(0).getPath()); + + + // Add file + // Add supporting evidences + actionMap = new ObjectMap() + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), ParamUtils.BasicUpdateAction.ADD) + .append(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), ParamUtils.BasicUpdateAction.ADD); + options = new QueryOptions() + .append(Constants.ACTIONS, actionMap) + .append(ParamConstants.INCLUDE_RESULT_PARAM, true); + reportToUpdate = new ClinicalReport() + .setFiles(Arrays.asList( + new File().setId("data:file1.txt"), + new File().setId("data:file3.txt") + )) + .setSupportingEvidences(Collections.singletonList( + new File().setId("data:file2.txt") + )); + reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, + options, sessionIdUser).first(); + // Check comments + assertEquals(1, reportResult.getComments().size()); + assertEquals("comment3", reportResult.getComments().get(0).getMessage()); + + // Check files + assertEquals(3, reportResult.getFiles().size()); + assertTrue(reportResult.getFiles().stream().map(File::getPath).collect(Collectors.toSet()) + .containsAll(Arrays.asList("data/file1.txt", "data/file2.txt", "data/file3.txt"))); + + // Check supporting evidences + assertEquals(3, reportResult.getSupportingEvidences().size()); + assertTrue(reportResult.getSupportingEvidences().stream().map(File::getPath).collect(Collectors.toSet()) + .containsAll(Arrays.asList("data/file1.txt", "data/file2.txt", "data/file3.txt"))); + } + @Test public void createAndUpdateClinicalAnalysisWithQualityControl() throws CatalogException, InterruptedException { Individual individual = new Individual().setId("child1").setSamples(Arrays.asList(new Sample().setId("sample2"))); diff --git a/opencga-server/src/main/java/org/opencb/opencga/server/rest/analysis/ClinicalWebService.java b/opencga-server/src/main/java/org/opencb/opencga/server/rest/analysis/ClinicalWebService.java index fdaa1e84449..30b06fb75e2 100644 --- a/opencga-server/src/main/java/org/opencb/opencga/server/rest/analysis/ClinicalWebService.java +++ b/opencga-server/src/main/java/org/opencb/opencga/server/rest/analysis/ClinicalWebService.java @@ -256,6 +256,51 @@ public Response update( } } + @POST + @Path("/{clinicalAnalysis}/report/update") + @Consumes(MediaType.APPLICATION_JSON) + @ApiOperation(value = "Update clinical analysis report", response = ClinicalReport.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = QueryOptions.INCLUDE, value = ParamConstants.INCLUDE_DESCRIPTION, + dataType = "string", paramType = "query"), + @ApiImplicitParam(name = QueryOptions.EXCLUDE, value = ParamConstants.EXCLUDE_DESCRIPTION, + dataType = "string", paramType = "query") + }) + public Response updateReport( + @ApiParam(value = "Clinical analysis ID") @PathParam(value = "clinicalAnalysis") String clinicalAnalysisStr, + @ApiParam(value = ParamConstants.STUDY_DESCRIPTION) @QueryParam(ParamConstants.STUDY_PARAM) String studyStr, + @ApiParam(value = "Action to be performed if the array of comments is being updated.", allowableValues = "ADD,REMOVE,REPLACE", defaultValue = "ADD") + @QueryParam("commentsAction") ParamUtils.AddRemoveReplaceAction commentsAction, + @ApiParam(value = "Action to be performed if the array of supporting evidences is being updated.", allowableValues = "ADD,SET,REMOVE", defaultValue = "ADD") + @QueryParam("supportingEvidencesAction") ParamUtils.BasicUpdateAction supportingEvidencesAction, + @ApiParam(value = "Action to be performed if the array of files is being updated.", allowableValues = "ADD,SET,REMOVE", defaultValue = "ADD") + @QueryParam("filesAction") ParamUtils.BasicUpdateAction filesAction, + @ApiParam(value = ParamConstants.INCLUDE_RESULT_DESCRIPTION, defaultValue = "false") @QueryParam(ParamConstants.INCLUDE_RESULT_PARAM) boolean includeResult, + @ApiParam(name = "body", value = "JSON containing clinical report information", required = true) ClinicalReport params) { + try { + if (commentsAction == null) { + commentsAction = ParamUtils.AddRemoveReplaceAction.ADD; + } + if (supportingEvidencesAction == null) { + supportingEvidencesAction = ParamUtils.BasicUpdateAction.ADD; + } + if (filesAction == null) { + filesAction = ParamUtils.BasicUpdateAction.ADD; + } + + Map actionMap = new HashMap<>(); + actionMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), commentsAction); + actionMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), supportingEvidencesAction); + actionMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), filesAction); + queryOptions.put(Constants.ACTIONS, actionMap); + + return createOkResponse(clinicalManager.updateReport(studyStr, clinicalAnalysisStr, params, queryOptions, token)); + } catch (Exception e) { + return createErrorResponse(e); + } + } + + @POST @Path("/annotationSets/load") @Consumes(MediaType.APPLICATION_JSON) From 98f3f05ce90cd8ba62552381770abb3ec7621414 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 20 Dec 2023 12:31:15 +0100 Subject: [PATCH 02/16] Prepare next release 2.12.2-SNAPSHOT --- opencga-analysis/pom.xml | 2 +- opencga-app/pom.xml | 2 +- opencga-catalog/pom.xml | 2 +- opencga-client/pom.xml | 2 +- opencga-clinical/pom.xml | 2 +- opencga-core/pom.xml | 2 +- opencga-master/pom.xml | 2 +- opencga-server/pom.xml | 2 +- opencga-storage/opencga-storage-app/pom.xml | 2 +- opencga-storage/opencga-storage-benchmark/pom.xml | 2 +- opencga-storage/opencga-storage-core/pom.xml | 2 +- .../opencga-storage-hadoop-core/pom.xml | 2 +- .../opencga-storage-hadoop-deps-emr6.1/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp2.6/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp3.1/pom.xml | 2 +- .../opencga-storage-hadoop-deps/pom.xml | 2 +- opencga-storage/opencga-storage-hadoop/pom.xml | 2 +- opencga-storage/opencga-storage-server/pom.xml | 2 +- opencga-storage/pom.xml | 2 +- opencga-test/pom.xml | 2 +- pom.xml | 14 +++++++------- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/opencga-analysis/pom.xml b/opencga-analysis/pom.xml index 3620242af2c..265e72c158e 100644 --- a/opencga-analysis/pom.xml +++ b/opencga-analysis/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml index 9e2a29dd451..90d4339f302 100644 --- a/opencga-app/pom.xml +++ b/opencga-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-catalog/pom.xml b/opencga-catalog/pom.xml index 689f4330468..b6c3104bb44 100644 --- a/opencga-catalog/pom.xml +++ b/opencga-catalog/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-client/pom.xml b/opencga-client/pom.xml index ade95955c9b..db92bb3fe27 100644 --- a/opencga-client/pom.xml +++ b/opencga-client/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-clinical/pom.xml b/opencga-clinical/pom.xml index 480e468ae22..693f452614d 100644 --- a/opencga-clinical/pom.xml +++ b/opencga-clinical/pom.xml @@ -5,7 +5,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/opencga-core/pom.xml b/opencga-core/pom.xml index 3bf4fe7f7b4..1282dec662d 100644 --- a/opencga-core/pom.xml +++ b/opencga-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-master/pom.xml b/opencga-master/pom.xml index 8722652af5a..6df937c20f9 100644 --- a/opencga-master/pom.xml +++ b/opencga-master/pom.xml @@ -22,7 +22,7 @@ opencga org.opencb.opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml index 1d95c4801af..3256b82216b 100644 --- a/opencga-server/pom.xml +++ b/opencga-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-app/pom.xml b/opencga-storage/opencga-storage-app/pom.xml index 028d6cf8fb3..2b3005ce736 100644 --- a/opencga-storage/opencga-storage-app/pom.xml +++ b/opencga-storage/opencga-storage-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-benchmark/pom.xml b/opencga-storage/opencga-storage-benchmark/pom.xml index 41915b70624..0b7b09f0e50 100644 --- a/opencga-storage/opencga-storage-benchmark/pom.xml +++ b/opencga-storage/opencga-storage-benchmark/pom.xml @@ -22,7 +22,7 @@ opencga-storage org.opencb.opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-core/pom.xml b/opencga-storage/opencga-storage-core/pom.xml index 4402b544436..407a2fe5afa 100644 --- a/opencga-storage/opencga-storage-core/pom.xml +++ b/opencga-storage/opencga-storage-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml index e6f06256409..ea8a4f03775 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml index 3b708836fe1..f7afa167980 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml index 56970c9e0a9..a584723d321 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml index ef7f5611e5f..9e3018c3075 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml index 605ef67fe0e..4dc58124cbe 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml @@ -50,7 +50,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml index c58f1007101..63ebff0a728 100644 --- a/opencga-storage/opencga-storage-hadoop/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/pom.xml @@ -28,7 +28,7 @@ org.opencb.opencga opencga-storage - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-server/pom.xml b/opencga-storage/opencga-storage-server/pom.xml index 37ae7d2a1c6..8405b936d23 100644 --- a/opencga-storage/opencga-storage-server/pom.xml +++ b/opencga-storage/opencga-storage-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-storage/pom.xml b/opencga-storage/pom.xml index 0c0e0b0d8a4..32a43076828 100644 --- a/opencga-storage/pom.xml +++ b/opencga-storage/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml index 821dbc0779e..2235e4a9ce8 100644 --- a/opencga-test/pom.xml +++ b/opencga-test/pom.xml @@ -24,7 +24,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index a61fd25104d..8da78d874e3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.1 + 2.12.2-SNAPSHOT pom OpenCGA @@ -43,12 +43,12 @@ - 2.12.1 - 2.12.1 - 5.8.1 - 2.12.1 - 4.12.0 - 2.12.1 + 2.12.2_dev + 2.12.2_dev + 5.8.2-SNAPSHOT + 2.12.2-SNAPSHOT + 4.12.1-SNAPSHOT + 2.12.2-SNAPSHOT 0.2.0 2.11.4 From 7e957cc066d9b5641cf8219116cf72a9c6b20da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20T=C3=A1rraga=20Gim=C3=A9nez?= Date: Thu, 11 Jan 2024 08:25:18 +0100 Subject: [PATCH 03/16] app: update opencga-ext-tools dockerfile, #TASK-5450 --- opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile b/opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile index ff1298c64d0..ab261b25c2f 100644 --- a/opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile +++ b/opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile @@ -25,11 +25,11 @@ RUN apt-get update -y && DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" apt WORKDIR /opt/opencga/signature.tools.lib RUN git fetch origin --tags && \ - git checkout tags/v2.4.2 && \ + git checkout tags/v2.4.4 && \ sed -i '/Mmusculus/d' DESCRIPTION && \ sed -i '/Cfamiliaris/d' DESCRIPTION && \ sed -i '/1000genomes/d' DESCRIPTION && \ - R -e 'options(timeout = 300);devtools::install(repos="https://www.stats.bris.ac.uk/R/")' && \ + R -e 'options(timeout = 3600);devtools::install(repos="https://www.stats.bris.ac.uk/R/")' && \ ## Clean up rm -rf /var/lib/apt/lists/* /tmp/* /opt/opencga/signature.tools.lib/.git && \ strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 From 09896024411d23b50e9290522aac3de99648cd0b Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 11 Jan 2024 13:13:42 +0100 Subject: [PATCH 04/16] pom: exclude slf4j-simple from azure dependencies #TASK-5404 --- pom.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pom.xml b/pom.xml index 8da78d874e3..73f4a916fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -849,6 +849,12 @@ com.microsoft.azure adal4j ${adal4j.version} + + + org.slf4j + slf4j-simple + + com.microsoft.graph @@ -874,11 +880,23 @@ com.microsoft.azure azure-client-runtime ${azure-client.version} + + + org.slf4j + slf4j-simple + + com.microsoft.azure azure-client-authentication ${azure-client.version} + + + org.slf4j + slf4j-simple + + org.apache.httpcomponents @@ -899,6 +917,12 @@ com.microsoft.azure azure-batch ${azure-batch.version} + + + org.slf4j + slf4j-simple + + io.fabric8 @@ -1005,6 +1029,12 @@ azure-storage-blob ${azure-storage-blob.version} ${azure.optional} + + + org.slf4j + slf4j-simple + + com.google.code.findbugs @@ -1040,6 +1070,12 @@ com.microsoft.azure azure ${azure.version} + + + org.slf4j + slf4j-simple + + org.glassfish.jersey.media From 3e90d6736ede77dcab73973f1ea139f4e89ca072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Coll=20Morag=C3=B3n?= Date: Fri, 12 Jan 2024 14:25:04 +0000 Subject: [PATCH 05/16] storage: Fix hbase ssh command execution. Avoid double splitting. #TASK-5452 --- opencga-app/app/misc/scripts/hadoop-ssh.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/opencga-app/app/misc/scripts/hadoop-ssh.sh b/opencga-app/app/misc/scripts/hadoop-ssh.sh index c39152339a9..30141a04074 100755 --- a/opencga-app/app/misc/scripts/hadoop-ssh.sh +++ b/opencga-app/app/misc/scripts/hadoop-ssh.sh @@ -1,45 +1,45 @@ #!/usr/bin/env sh -if [ -z ${HADOOP_SSH_USER} ] ; then +if [ -z "${HADOOP_SSH_USER}" ] ; then echo "Undefined HADOOP_SSH_USER" 1>&2 exit 1 fi -if [ -z ${HADOOP_SSH_HOST} ] ; then +if [ -z "${HADOOP_SSH_HOST}" ] ; then echo "Undefined HADOOP_SSH_HOST" 1>&2 exit 1 fi SSHPASS_CMD= -if [ -z ${SSHPASS} ] ; then +if [ -z "${SSHPASS}" ] ; then # If empty, assume ssh-key exists in the system SSHPASS_CMD="" else # If non zero, use sshpass command - SSHPASS_CMD="sshpass -e" + SSHPASS_CMD="sshpass -e " fi SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=60" -if [ ! -z ${HADOOP_SSH_KEY} ] && [ -f ${HADOOP_SSH_KEY} ] ; then +if [ -n "${HADOOP_SSH_KEY}" ] && [ -f "${HADOOP_SSH_KEY}" ] ; then SSH_OPTS="${SSH_OPTS} -i ${HADOOP_SSH_KEY}" fi echo "Connect to Hadoop edge node ${HADOOP_SSH_USER}@${HADOOP_SSH_HOST}" 1>&2 -echo "${SSHPASS_CMD} ssh ${SSH_OPTS} ${HADOOP_SSH_USER}@${HADOOP_SSH_HOST}" 1>&2 +echo "${SSHPASS_CMD}ssh ${SSH_OPTS} ${HADOOP_SSH_USER}@${HADOOP_SSH_HOST}" 1>&2 # Escape args with single quotes CMD= -for arg in $@ ; do +for arg in "$@" ; do # Escape single quote, if any : # arg=`echo $arg | sed "s/'/'\"'\"'/g"` # aaa'aaa --> 'aaa'"'"'aaa' - arg=`echo $arg | sed "s/'/'\\\\\\''/g"` # aaa'aaa --> 'aaa'\''aaa' + arg=$(echo "$arg" | sed "s/'/'\\\\\\''/g") # aaa'aaa --> 'aaa'\''aaa' CMD="${CMD}'${arg}' " done echo ${CMD} -${SSHPASS_CMD} ssh ${SSH_OPTS} ${HADOOP_SSH_USER}@${HADOOP_SSH_HOST} /bin/bash << EOF +${SSHPASS_CMD} ssh ${SSH_OPTS} "${HADOOP_SSH_USER}@${HADOOP_SSH_HOST}" /bin/bash << EOF export HADOOP_CLASSPATH=${HADOOP_CLASSPATH} export HADOOP_USER_CLASSPATH_FIRST=${HADOOP_USER_CLASSPATH_FIRST} From 9eaef09735656f4eaa84a36b0dc76d2f759ef209 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 18 Jan 2024 18:16:51 +0100 Subject: [PATCH 06/16] Copy method getObjectAsJSON to CommandExecutor for be used in enterprise #TASK-5482 --- .../opencga/app/cli/CommandExecutor.java | 99 +++++++++++++++++++ .../executors/OpencgaCommandExecutor.java | 85 +--------------- 2 files changed, 100 insertions(+), 84 deletions(-) diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java index d4877431f35..3b855444adf 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java @@ -17,16 +17,25 @@ package org.opencb.opencga.app.cli; import com.beust.jcommander.JCommander; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; +import org.opencb.commons.datastore.core.ObjectMap; import org.opencb.commons.utils.FileUtils; import org.opencb.commons.utils.PrintUtils; +import org.opencb.opencga.app.cli.main.utils.CommandLineUtils; import org.opencb.opencga.app.cli.session.SessionManager; import org.opencb.opencga.client.config.ClientConfiguration; import org.opencb.opencga.client.exceptions.ClientException; +import org.opencb.opencga.client.rest.OpenCGAClient; import org.opencb.opencga.core.config.Configuration; import org.opencb.opencga.core.config.storage.StorageConfiguration; +import org.opencb.opencga.core.response.RestResponse; +import org.opencb.opencga.server.generator.models.RestCategory; +import org.opencb.opencga.server.generator.models.RestEndpoint; +import org.opencb.opencga.server.generator.models.RestParameter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +45,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.List; /** * Created by imedina on 19/04/16. @@ -281,6 +291,95 @@ public CommandExecutor setSessionManager(SessionManager sessionManager) { return this; } + + public String getObjectAsJSON(String objectCategory, String objectPath, OpenCGAClient openCGAClient) throws Exception { + StringBuilder jsonInString = new StringBuilder("\n"); + try { + ObjectMap queryParams = new ObjectMap(); + queryParams.putIfNotEmpty("category", objectCategory); + RestResponse response = openCGAClient.getMetaClient().api(queryParams); + ObjectMapper jsonObjectMapper = new ObjectMapper(); + for (List list : response.getResponses().get(0).getResults()) { + List categories = jsonObjectMapper.convertValue(list, new TypeReference>() {}); + for (RestCategory category : categories) { + for (RestEndpoint endpoint : category.getEndpoints()) { + if (objectPath.equals(endpoint.getPath())) { + boolean enc = false; + for (RestParameter parameter : endpoint.getParameters()) { + //jsonInString += parameter.getName()+":"+parameter.getAllowedValues()+"\n"; + if (parameter.getData() != null) { + enc = true; + jsonInString.append(printBody(parameter.getData(), "")); + } + } + if (!enc) { + jsonInString.append("No model available"); + } + // + } + } + } + } + } catch (Exception e) { + jsonInString = new StringBuilder("Data model not found."); + CommandLineUtils.error(e); + } + return jsonInString.toString(); + } + + private String printBody(List data, String tabs) { + String res = ""; + res += "{\n"; + String tab = " " + tabs; + for (RestParameter parameter : data) { + if (parameter.getData() == null) { + res += printParameter(parameter, tab); + } else { + res += tab + parameter.getName() + "\"" + ": [" + printBody(parameter.getData(), tab) + "],\n"; + } + } + res += tabs + "}"; + return res; + + } + + private String printParameter(RestParameter parameter, String tab) { + + return tab + "\"" + parameter.getName() + "\"" + ":" + printParameterValue(parameter) + ",\n"; + } + + private String printParameterValue(RestParameter parameter) { + + if(!StringUtils.isEmpty(parameter.getAllowedValues())){ + return parameter.getAllowedValues().replace(" ", "|"); + } + switch (parameter.getType()) { + case "Boolean": + case "java.lang.Boolean": + return "false"; + case "Long": + case "Float": + case "Double": + case "Integer": + case "int": + case "double": + case "float": + case "long": + return "0"; + case "List": + return "[\"\"]"; + case "Date": + return "\"dd/mm/yyyy\""; + case "Map": + return "{\"key\": \"value\"}"; + case "String": + return "\"\""; + default: + return "\"-\""; + } + } + + public Logger getLogger() { return logger; } diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/OpencgaCommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/OpencgaCommandExecutor.java index 8f935c36ff8..72f9bdd0e8c 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/OpencgaCommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/OpencgaCommandExecutor.java @@ -225,90 +225,7 @@ public OpencgaCommandExecutor setOpenCGAClient(OpenCGAClient openCGAClient) { } public String getObjectAsJSON(String objectCategory, String objectPath) throws Exception { - StringBuilder jsonInString = new StringBuilder("\n"); - try { - ObjectMap queryParams = new ObjectMap(); - queryParams.putIfNotEmpty("category", objectCategory); - RestResponse response = openCGAClient.getMetaClient().api(queryParams); - ObjectMapper jsonObjectMapper = new ObjectMapper(); - for (List list : response.getResponses().get(0).getResults()) { - List categories = jsonObjectMapper.convertValue(list, new TypeReference>() {}); - for (RestCategory category : categories) { - for (RestEndpoint endpoint : category.getEndpoints()) { - if (objectPath.equals(endpoint.getPath())) { - boolean enc = false; - for (RestParameter parameter : endpoint.getParameters()) { - //jsonInString += parameter.getName()+":"+parameter.getAllowedValues()+"\n"; - if (parameter.getData() != null) { - enc = true; - jsonInString.append(printBody(parameter.getData(), "")); - } - } - if (!enc) { - jsonInString.append("No model available"); - } - // - } - } - } - } - } catch (Exception e) { - jsonInString = new StringBuilder("Data model not found."); - CommandLineUtils.error(e); - } - return jsonInString.toString(); - } - - private String printBody(List data, String tabs) { - String res = ""; - res += "{\n"; - String tab = " " + tabs; - for (RestParameter parameter : data) { - if (parameter.getData() == null) { - res += printParameter(parameter, tab); - } else { - res += tab + parameter.getName() + "\"" + ": [" + printBody(parameter.getData(), tab) + "],\n"; - } - } - res += tabs + "}"; - return res; - - } - - private String printParameter(RestParameter parameter, String tab) { - - return tab + "\"" + parameter.getName() + "\"" + ":" + printParameterValue(parameter) + ",\n"; - } - - private String printParameterValue(RestParameter parameter) { - - if(!StringUtils.isEmpty(parameter.getAllowedValues())){ - return parameter.getAllowedValues().replace(" ", "|"); - } - switch (parameter.getType()) { - case "Boolean": - case "java.lang.Boolean": - return "false"; - case "Long": - case "Float": - case "Double": - case "Integer": - case "int": - case "double": - case "float": - case "long": - return "0"; - case "List": - return "[\"\"]"; - case "Date": - return "\"dd/mm/yyyy\""; - case "Map": - return "{\"key\": \"value\"}"; - case "String": - return "\"\""; - default: - return "\"-\""; - } + return super.getObjectAsJSON(objectCategory, objectPath, openCGAClient); } private boolean isNumeric(String type) { From 3f1c8f8b575b3f19d7951aedd809f5ba68a53670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20T=C3=A1rraga=20Gim=C3=A9nez?= Date: Fri, 19 Jan 2024 12:07:32 +0100 Subject: [PATCH 07/16] app: update the content of the resource README file, #TASK-5501 --- opencga-app/app/analysis/resources/README | 57 ++--------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/opencga-app/app/analysis/resources/README b/opencga-app/app/analysis/resources/README index fa335694428..ed41c2e6f38 100644 --- a/opencga-app/app/analysis/resources/README +++ b/opencga-app/app/analysis/resources/README @@ -1,55 +1,6 @@ README - -In this folder, users should store external files to be used by some OpenCGA analysis. - -1) roleInCancer.txt[.gz] - -This file is used by interpretation clinical analysis, e.g., Tiering and TEAM analysis. - -It stores those genes which contain mutations that have been casually implicated in cancer. This information can be downloaded -from the Cancer Gene Census (CGC) at https://cancer.sanger.ac.uk/census - -The file consists of two tab-separated columns: the first one contains the gene name, and the second, the role in cancer, i.e.: oncogne, -TSG, fusion. In addition, lines starting with # are considered comments and will be ignored. - -Sample of a roleInCancer file: - -#Gene name Role in Cancer -A1CF oncogene -ABI1 TSG, fusion -ABL1 oncogene, fusion -ABL2 oncogene, fusion -ACKR3 oncogene, fusion -ACSL3 fusion -... -... - - -2) actionableVariants_xxx.txt[.gz] where xxx = assembly, e.g.: grch37 - -This file is used by interpretation clinical analysis, e.g., TEAM analysis. - -It stores variants that were identified as clinically actionable variants. The file consists of the following twelve tab-separated columns: - - Chromosome - - Start - - Stop - - Reference allele - - Alternate allele - - dbSNP ID - - ClinVar Variant ID - - HGVS - - Phenotype list - - Clinical significance - - Review status - - Submitter categories - -In addition, lines starting with # are considered comments and will be ignored. - -Sample fo an actionableVariants file: - -#Chromosome Start Stop ReferenceAllele AlternateAllele dbSNP ID ClinVar Variant ID hgvs PhenotypeList ClinicalSignificance ReviewStatus SubmitterCategories -2 47702269 47702269 C T rs28929483 1753 NM_000251.2(MSH2):c.1865C>T (p.Pro622Leu) Hereditary cancer-predisposing syndrome;Hereditary nonpolyposis colon cancer;Lynch syndrome;Lynch syndrome I Pathogenic reviewed by expert panel 3 -2 47657020 47657020 C T rs63751108 1755 NM_000251.2(MSH2):c.1216C>T (p.Arg406Ter) Carcinoma of colon;Hereditary cancer-predisposing syndrome;Hereditary nonpolyposis colon cancer;Lynch syndrome;Lynch syndrome I;not provided Pathogenic reviewed by expert panel 3 -... -... +This directory is designated for OpenCGA analyses to download the necessary external data. +For instance, during the first Exomiser analysis, the files '2109_hg38.zip' and '2109_phenotype.zip' will be downloaded +from the OpenCGA analysis URL and stored in the 'exomiser' folder within this directory. Subsequent Exomiser analyses will +then access this folder to read these files. From 0b8ca91200a5b457887744f8ff44b4d89858ccf1 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 23 Jan 2024 19:40:16 +0100 Subject: [PATCH 08/16] Added workaround for sonar --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 73f4a916fb3..4be2bab2ecb 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,12 @@ 2.5-20081211 2.23.0 + + true From d75b215b4a34eaff8ed2048b73ea61736e34f266 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 26 Jan 2024 18:25:21 +0100 Subject: [PATCH 09/16] CommanExecutor: Fix malformed JSON #TASK-5511 --- .../main/java/org/opencb/opencga/app/cli/CommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java index 3b855444adf..cd532449d4e 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/CommandExecutor.java @@ -335,7 +335,7 @@ private String printBody(List data, String tabs) { if (parameter.getData() == null) { res += printParameter(parameter, tab); } else { - res += tab + parameter.getName() + "\"" + ": [" + printBody(parameter.getData(), tab) + "],\n"; + res += tab + "\"" +parameter.getName() + "\"" + ": [" + printBody(parameter.getData(), tab) + "],\n"; } } res += tabs + "}"; From a3fcda03a8e4aaa425669ac912ee637167567496 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 30 Jan 2024 16:59:55 +0100 Subject: [PATCH 10/16] Clients for release 2.12.2 #TASK-5445 --- .../app/cli/main/OpenCgaCompleter.java | 4 +- .../app/cli/main/OpencgaCliOptionsParser.java | 3 +- .../AnalysisClinicalCommandExecutor.java | 47 ++++++++++++++ .../AnalysisClinicalCommandOptions.java | 61 +++++++++++++++++++ opencga-client/src/main/R/R/Admin-methods.R | 2 +- .../src/main/R/R/Alignment-methods.R | 2 +- opencga-client/src/main/R/R/AllGenerics.R | 22 +++---- .../src/main/R/R/Clinical-methods.R | 20 +++++- opencga-client/src/main/R/R/Cohort-methods.R | 4 +- opencga-client/src/main/R/R/Family-methods.R | 4 +- opencga-client/src/main/R/R/File-methods.R | 4 +- opencga-client/src/main/R/R/GA4GH-methods.R | 2 +- .../src/main/R/R/Individual-methods.R | 4 +- opencga-client/src/main/R/R/Job-methods.R | 4 +- opencga-client/src/main/R/R/Meta-methods.R | 2 +- .../src/main/R/R/Operation-methods.R | 2 +- opencga-client/src/main/R/R/Panel-methods.R | 4 +- opencga-client/src/main/R/R/Project-methods.R | 4 +- opencga-client/src/main/R/R/Sample-methods.R | 4 +- opencga-client/src/main/R/R/Study-methods.R | 4 +- opencga-client/src/main/R/R/User-methods.R | 4 +- opencga-client/src/main/R/R/Variant-methods.R | 2 +- .../client/rest/clients/AdminClient.java | 6 +- .../client/rest/clients/AlignmentClient.java | 6 +- .../rest/clients/ClinicalAnalysisClient.java | 29 ++++++++- .../client/rest/clients/CohortClient.java | 6 +- .../rest/clients/DiseasePanelClient.java | 6 +- .../client/rest/clients/FamilyClient.java | 6 +- .../client/rest/clients/FileClient.java | 6 +- .../client/rest/clients/GA4GHClient.java | 6 +- .../client/rest/clients/IndividualClient.java | 6 +- .../client/rest/clients/JobClient.java | 6 +- .../client/rest/clients/MetaClient.java | 6 +- .../client/rest/clients/ProjectClient.java | 6 +- .../client/rest/clients/SampleClient.java | 6 +- .../client/rest/clients/StudyClient.java | 6 +- .../client/rest/clients/UserClient.java | 6 +- .../client/rest/clients/VariantClient.java | 6 +- .../rest/clients/VariantOperationClient.java | 6 +- opencga-client/src/main/javascript/Admin.js | 2 +- .../src/main/javascript/Alignment.js | 2 +- .../src/main/javascript/ClinicalAnalysis.js | 23 ++++++- opencga-client/src/main/javascript/Cohort.js | 2 +- .../src/main/javascript/DiseasePanel.js | 2 +- opencga-client/src/main/javascript/Family.js | 2 +- opencga-client/src/main/javascript/File.js | 2 +- opencga-client/src/main/javascript/GA4GH.js | 2 +- .../src/main/javascript/Individual.js | 2 +- opencga-client/src/main/javascript/Job.js | 2 +- opencga-client/src/main/javascript/Meta.js | 2 +- opencga-client/src/main/javascript/Project.js | 2 +- opencga-client/src/main/javascript/Sample.js | 2 +- opencga-client/src/main/javascript/Study.js | 2 +- opencga-client/src/main/javascript/User.js | 2 +- opencga-client/src/main/javascript/Variant.js | 2 +- .../src/main/javascript/VariantOperation.js | 2 +- .../pyopencga/rest_clients/admin_client.py | 4 +- .../rest_clients/alignment_client.py | 4 +- .../rest_clients/clinical_analysis_client.py | 31 +++++++++- .../pyopencga/rest_clients/cohort_client.py | 4 +- .../rest_clients/disease_panel_client.py | 4 +- .../pyopencga/rest_clients/family_client.py | 4 +- .../pyopencga/rest_clients/file_client.py | 4 +- .../pyopencga/rest_clients/ga4gh_client.py | 4 +- .../rest_clients/individual_client.py | 4 +- .../pyopencga/rest_clients/job_client.py | 4 +- .../pyopencga/rest_clients/meta_client.py | 4 +- .../pyopencga/rest_clients/project_client.py | 4 +- .../pyopencga/rest_clients/sample_client.py | 4 +- .../pyopencga/rest_clients/study_client.py | 4 +- .../pyopencga/rest_clients/user_client.py | 4 +- .../pyopencga/rest_clients/variant_client.py | 4 +- .../rest_clients/variant_operation_client.py | 4 +- 73 files changed, 340 insertions(+), 144 deletions(-) diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java index 154dd0010dd..31d1c757700 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023-12-15 OpenCB +* Copyright 2015-2024-01-30 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public abstract class OpenCgaCompleter implements Completer { .map(Candidate::new) .collect(toList()); - private List clinicalList = asList( "acl-update","annotation-sets-load","clinical-configuration-update","create","distinct","interpretation-distinct","interpretation-search","interpretation-info","interpreter-cancer-tiering-run","interpreter-exomiser-run","interpreter-team-run","interpreter-tiering-run","interpreter-zetta-run","rga-aggregation-stats","rga-gene-query","rga-gene-summary","rga-index-run","rga-individual-query","rga-individual-summary","rga-variant-query","rga-variant-summary","search","variant-query","acl","delete","update","annotation-sets-annotations-update","info","interpretation-create","interpretation-clear","interpretation-delete","interpretation-revert","interpretation-update") + private List clinicalList = asList( "acl-update","annotation-sets-load","clinical-configuration-update","create","distinct","interpretation-distinct","interpretation-search","interpretation-info","interpreter-cancer-tiering-run","interpreter-exomiser-run","interpreter-team-run","interpreter-tiering-run","interpreter-zetta-run","rga-aggregation-stats","rga-gene-query","rga-gene-summary","rga-index-run","rga-individual-query","rga-individual-summary","rga-variant-query","rga-variant-summary","search","variant-query","acl","delete","update","annotation-sets-annotations-update","info","interpretation-create","interpretation-clear","interpretation-delete","interpretation-revert","interpretation-update","report-update") .stream() .map(Candidate::new) .collect(toList()); diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java index a88d83dac78..fe013c129cd 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023-12-15 OpenCB +* Copyright 2015-2024-01-30 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,6 +160,7 @@ public OpencgaCliOptionsParser() { analysisClinicalSubCommands.addCommand("interpretation-delete", analysisClinicalCommandOptions.deleteInterpretationCommandOptions); analysisClinicalSubCommands.addCommand("interpretation-revert", analysisClinicalCommandOptions.revertInterpretationCommandOptions); analysisClinicalSubCommands.addCommand("interpretation-update", analysisClinicalCommandOptions.updateInterpretationCommandOptions); + analysisClinicalSubCommands.addCommand("report-update", analysisClinicalCommandOptions.updateReportCommandOptions); jobsCommandOptions = new JobsCommandOptions(commonCommandOptions, jCommander); jCommander.addCommand("jobs", jobsCommandOptions); diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/AnalysisClinicalCommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/AnalysisClinicalCommandExecutor.java index 490e6ca3166..22df7f71de9 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/AnalysisClinicalCommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/AnalysisClinicalCommandExecutor.java @@ -198,6 +198,9 @@ public void execute() throws Exception { case "interpretation-update": queryResponse = updateInterpretation(); break; + case "report-update": + queryResponse = updateReport(); + break; default: logger.error("Subcommand not valid"); break; @@ -1445,4 +1448,48 @@ private RestResponse updateInterpretation() throws Exception { } return openCGAClient.getClinicalAnalysisClient().updateInterpretation(commandOptions.clinicalAnalysis, commandOptions.interpretation, interpretationUpdateParams, queryParams); } + + private RestResponse updateReport() throws Exception { + logger.debug("Executing updateReport in Analysis - Clinical command line"); + + AnalysisClinicalCommandOptions.UpdateReportCommandOptions commandOptions = analysisClinicalCommandOptions.updateReportCommandOptions; + + ObjectMap queryParams = new ObjectMap(); + queryParams.putIfNotEmpty("include", commandOptions.include); + queryParams.putIfNotEmpty("exclude", commandOptions.exclude); + queryParams.putIfNotEmpty("study", commandOptions.study); + queryParams.putIfNotNull("supportingEvidencesAction", commandOptions.supportingEvidencesAction); + queryParams.putIfNotNull("includeResult", commandOptions.includeResult); + if (queryParams.get("study") == null && OpencgaMain.isShellMode()) { + queryParams.putIfNotEmpty("study", sessionManager.getSession().getCurrentStudy()); + } + + + ClinicalReport clinicalReport = null; + if (commandOptions.jsonDataModel) { + RestResponse res = new RestResponse<>(); + res.setType(QueryType.VOID); + PrintUtils.println(getObjectAsJSON(categoryName,"/{apiVersion}/analysis/clinical/{clinicalAnalysis}/report/update")); + return res; + } else if (commandOptions.jsonFile != null) { + clinicalReport = JacksonUtils.getDefaultObjectMapper() + .readValue(new java.io.File(commandOptions.jsonFile), ClinicalReport.class); + } else { + ObjectMap beanParams = new ObjectMap(); + putNestedIfNotEmpty(beanParams, "title",commandOptions.title, true); + putNestedIfNotEmpty(beanParams, "overview",commandOptions.overview, true); + putNestedIfNotEmpty(beanParams, "discussion.author",commandOptions.discussionAuthor, true); + putNestedIfNotEmpty(beanParams, "discussion.date",commandOptions.discussionDate, true); + putNestedIfNotEmpty(beanParams, "discussion.text",commandOptions.discussionText, true); + putNestedIfNotEmpty(beanParams, "logo",commandOptions.logo, true); + putNestedIfNotEmpty(beanParams, "signedBy",commandOptions.signedBy, true); + putNestedIfNotEmpty(beanParams, "signature",commandOptions.signature, true); + putNestedIfNotEmpty(beanParams, "date",commandOptions.date, true); + + clinicalReport = JacksonUtils.getDefaultObjectMapper().copy() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true) + .readValue(beanParams.toJson(), ClinicalReport.class); + } + return openCGAClient.getClinicalAnalysisClient().updateReport(commandOptions.clinicalAnalysis, clinicalReport, queryParams); + } } \ No newline at end of file diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java index 11d6220ddef..3a7ccffd4bd 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java @@ -66,6 +66,7 @@ public class AnalysisClinicalCommandOptions { public DeleteInterpretationCommandOptions deleteInterpretationCommandOptions; public RevertInterpretationCommandOptions revertInterpretationCommandOptions; public UpdateInterpretationCommandOptions updateInterpretationCommandOptions; + public UpdateReportCommandOptions updateReportCommandOptions; public AnalysisClinicalCommandOptions(CommonCommandOptions commonCommandOptions, JCommander jCommander) { @@ -105,6 +106,7 @@ public AnalysisClinicalCommandOptions(CommonCommandOptions commonCommandOptions, this.deleteInterpretationCommandOptions = new DeleteInterpretationCommandOptions(); this.revertInterpretationCommandOptions = new RevertInterpretationCommandOptions(); this.updateInterpretationCommandOptions = new UpdateInterpretationCommandOptions(); + this.updateReportCommandOptions = new UpdateReportCommandOptions(); } @@ -2274,4 +2276,63 @@ public class UpdateInterpretationCommandOptions { } + @Parameters(commandNames = {"report-update"}, commandDescription ="Update clinical analysis report") + public class UpdateReportCommandOptions { + + @ParametersDelegate + public CommonCommandOptions commonOptions = commonCommandOptions; + + @Parameter(names = {"--json-file"}, description = "File with the body data in JSON format. Note, that using this parameter will ignore all the other parameters.", required = false, arity = 1) + public String jsonFile; + + @Parameter(names = {"--json-data-model"}, description = "Show example of file structure for body data.", help = true, arity = 0) + public Boolean jsonDataModel = false; + + @Parameter(names = {"--include", "-I"}, description = "Fields included in the response, whole JSON path must be provided", required = false, arity = 1) + public String include; + + @Parameter(names = {"--exclude", "-E"}, description = "Fields excluded in the response, whole JSON path must be provided", required = false, arity = 1) + public String exclude; + + @Parameter(names = {"--clinical-analysis"}, description = "Clinical analysis ID", required = true, arity = 1) + public String clinicalAnalysis; + + @Parameter(names = {"--study", "-s"}, description = "Study [[user@]project:]study where study and project can be either the ID or UUID", required = false, arity = 1) + public String study; + + @Parameter(names = {"--supporting-evidences-action"}, description = "Action to be performed if the array of supporting evidences is being updated.", required = false, arity = 1) + public String supportingEvidencesAction = "ADD"; + + @Parameter(names = {"--include-result"}, description = "Flag indicating to include the created or updated document result in the response", required = false, help = true, arity = 0) + public boolean includeResult = false; + + @Parameter(names = {"--title"}, description = "Report title.", required = false, arity = 1) + public String title; + + @Parameter(names = {"--overview"}, description = "Report overview.", required = false, arity = 1) + public String overview; + + @Parameter(names = {"--discussion-author"}, description = "The body web service author parameter", required = false, arity = 1) + public String discussionAuthor; + + @Parameter(names = {"--discussion-date"}, description = "The body web service date parameter", required = false, arity = 1) + public String discussionDate; + + @Parameter(names = {"--discussion-text"}, description = "The body web service text parameter", required = false, arity = 1) + public String discussionText; + + @Parameter(names = {"--logo"}, description = "Report logo.", required = false, arity = 1) + public String logo; + + @Parameter(names = {"--signed-by"}, description = "Indicates who has signed the report.", required = false, arity = 1) + public String signedBy; + + @Parameter(names = {"--signature"}, description = "Report signature.", required = false, arity = 1) + public String signature; + + @Parameter(names = {"--date"}, description = "Report date.", required = false, arity = 1) + public String date; + + } + } \ No newline at end of file diff --git a/opencga-client/src/main/R/R/Admin-methods.R b/opencga-client/src/main/R/R/Admin-methods.R index 82c35928a09..cd6c1bd235a 100644 --- a/opencga-client/src/main/R/R/Admin-methods.R +++ b/opencga-client/src/main/R/R/Admin-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Alignment-methods.R b/opencga-client/src/main/R/R/Alignment-methods.R index 5f7dd5ccb76..a3110d0b076 100644 --- a/opencga-client/src/main/R/R/Alignment-methods.R +++ b/opencga-client/src/main/R/R/Alignment-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/AllGenerics.R b/opencga-client/src/main/R/R/AllGenerics.R index e617555c2fe..177a61e827a 100644 --- a/opencga-client/src/main/R/R/AllGenerics.R +++ b/opencga-client/src/main/R/R/AllGenerics.R @@ -1,51 +1,51 @@ # ############################################################################## ## UserClient -setGeneric("userClient", function(OpencgaR, filterId, user, users, endpointName, params=NULL, ...) +setGeneric("userClient", function(OpencgaR, user, users, filterId, endpointName, params=NULL, ...) standardGeneric("userClient")) # ############################################################################## ## ProjectClient -setGeneric("projectClient", function(OpencgaR, projects, project, endpointName, params=NULL, ...) +setGeneric("projectClient", function(OpencgaR, project, projects, endpointName, params=NULL, ...) standardGeneric("projectClient")) # ############################################################################## ## StudyClient -setGeneric("studyClient", function(OpencgaR, members, templateId, group, studies, variableSet, study, endpointName, params=NULL, ...) +setGeneric("studyClient", function(OpencgaR, studies, members, templateId, study, variableSet, group, endpointName, params=NULL, ...) standardGeneric("studyClient")) # ############################################################################## ## FileClient -setGeneric("fileClient", function(OpencgaR, members, annotationSet, files, folder, file, endpointName, params=NULL, ...) +setGeneric("fileClient", function(OpencgaR, members, folder, file, files, annotationSet, endpointName, params=NULL, ...) standardGeneric("fileClient")) # ############################################################################## ## JobClient -setGeneric("jobClient", function(OpencgaR, members, job, jobs, endpointName, params=NULL, ...) +setGeneric("jobClient", function(OpencgaR, jobs, members, job, endpointName, params=NULL, ...) standardGeneric("jobClient")) # ############################################################################## ## SampleClient -setGeneric("sampleClient", function(OpencgaR, samples, members, sample, annotationSet, endpointName, params=NULL, ...) +setGeneric("sampleClient", function(OpencgaR, annotationSet, members, sample, samples, endpointName, params=NULL, ...) standardGeneric("sampleClient")) # ############################################################################## ## IndividualClient -setGeneric("individualClient", function(OpencgaR, annotationSet, members, individual, individuals, endpointName, params=NULL, ...) +setGeneric("individualClient", function(OpencgaR, members, annotationSet, individuals, individual, endpointName, params=NULL, ...) standardGeneric("individualClient")) # ############################################################################## ## FamilyClient -setGeneric("familyClient", function(OpencgaR, family, members, annotationSet, families, endpointName, params=NULL, ...) +setGeneric("familyClient", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) standardGeneric("familyClient")) # ############################################################################## ## CohortClient -setGeneric("cohortClient", function(OpencgaR, members, cohort, annotationSet, cohorts, endpointName, params=NULL, ...) +setGeneric("cohortClient", function(OpencgaR, cohort, annotationSet, members, cohorts, endpointName, params=NULL, ...) standardGeneric("cohortClient")) # ############################################################################## ## PanelClient -setGeneric("panelClient", function(OpencgaR, members, panels, endpointName, params=NULL, ...) +setGeneric("panelClient", function(OpencgaR, panels, members, endpointName, params=NULL, ...) standardGeneric("panelClient")) # ############################################################################## @@ -60,7 +60,7 @@ setGeneric("variantClient", function(OpencgaR, endpointName, params=NULL, ...) # ############################################################################## ## ClinicalClient -setGeneric("clinicalClient", function(OpencgaR, members, annotationSet, interpretation, clinicalAnalyses, clinicalAnalysis, interpretations, endpointName, params=NULL, ...) +setGeneric("clinicalClient", function(OpencgaR, members, interpretations, clinicalAnalysis, interpretation, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) standardGeneric("clinicalClient")) # ############################################################################## diff --git a/opencga-client/src/main/R/R/Clinical-methods.R b/opencga-client/src/main/R/R/Clinical-methods.R index a65b13dc3c0..9184f341a42 100644 --- a/opencga-client/src/main/R/R/Clinical-methods.R +++ b/opencga-client/src/main/R/R/Clinical-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -53,6 +53,7 @@ #' | deleteInterpretation | /{apiVersion}/analysis/clinical/{clinicalAnalysis}/interpretation/{interpretations}/delete | study, clinicalAnalysis[*], interpretations[*], setAsPrimary | #' | revertInterpretation | /{apiVersion}/analysis/clinical/{clinicalAnalysis}/interpretation/{interpretation}/revert | study, clinicalAnalysis[*], interpretation[*], version[*] | #' | updateInterpretation | /{apiVersion}/analysis/clinical/{clinicalAnalysis}/interpretation/{interpretation}/update | include, exclude, study, primaryFindingsAction, methodsAction, secondaryFindingsAction, commentsAction, panelsAction, setAs, clinicalAnalysis[*], interpretation[*], includeResult, body[*] | +#' | updateReport | /{apiVersion}/analysis/clinical/{clinicalAnalysis}/report/update | include, exclude, clinicalAnalysis[*], study, commentsAction, supportingEvidencesAction, filesAction, includeResult, body[*] | #' #' @md #' @seealso \url{http://docs.opencb.org/display/opencga/Using+OpenCGA} and the RESTful API documentation @@ -60,7 +61,7 @@ #' [*]: Required parameter #' @export -setMethod("clinicalClient", "OpencgaR", function(OpencgaR, members, annotationSet, interpretation, clinicalAnalyses, clinicalAnalysis, interpretations, endpointName, params=NULL, ...) { +setMethod("clinicalClient", "OpencgaR", function(OpencgaR, members, interpretations, clinicalAnalysis, interpretation, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/analysis/clinical/acl/{members}/update: @@ -715,5 +716,20 @@ setMethod("clinicalClient", "OpencgaR", function(OpencgaR, members, annotationSe updateInterpretation=fetchOpenCGA(object=OpencgaR, category="analysis/clinical", categoryId=clinicalAnalysis, subcategory="interpretation", subcategoryId=interpretation, action="update", params=params, httpMethod="POST", as.queryParam=NULL, ...), + + #' @section Endpoint /{apiVersion}/analysis/clinical/{clinicalAnalysis}/report/update: + #' Update clinical analysis report. + #' @param include Fields included in the response, whole JSON path must be provided. + #' @param exclude Fields excluded in the response, whole JSON path must be provided. + #' @param clinicalAnalysis Clinical analysis ID. + #' @param study Study [[user@]project:]study where study and project can be either the ID or UUID. + #' @param commentsAction Action to be performed if the array of comments is being updated. Allowed values: ['ADD REMOVE REPLACE'] + #' @param supportingEvidencesAction Action to be performed if the array of supporting evidences is being updated. Allowed values: ['ADD SET REMOVE'] + #' @param filesAction Action to be performed if the array of files is being updated. Allowed values: ['ADD SET REMOVE'] + #' @param includeResult Flag indicating to include the created or updated document result in the response. + #' @param data JSON containing clinical report information. + updateReport=fetchOpenCGA(object=OpencgaR, category="analysis/clinical", categoryId=clinicalAnalysis, + subcategory="report", subcategoryId=NULL, action="update", params=params, httpMethod="POST", + as.queryParam=NULL, ...), ) }) \ No newline at end of file diff --git a/opencga-client/src/main/R/R/Cohort-methods.R b/opencga-client/src/main/R/R/Cohort-methods.R index 5ae80da7c28..ff52e896b22 100644 --- a/opencga-client/src/main/R/R/Cohort-methods.R +++ b/opencga-client/src/main/R/R/Cohort-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -39,7 +39,7 @@ #' [*]: Required parameter #' @export -setMethod("cohortClient", "OpencgaR", function(OpencgaR, members, cohort, annotationSet, cohorts, endpointName, params=NULL, ...) { +setMethod("cohortClient", "OpencgaR", function(OpencgaR, cohort, annotationSet, members, cohorts, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/cohorts/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Family-methods.R b/opencga-client/src/main/R/R/Family-methods.R index 12a05627674..a0ae9ced80d 100644 --- a/opencga-client/src/main/R/R/Family-methods.R +++ b/opencga-client/src/main/R/R/Family-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -38,7 +38,7 @@ #' [*]: Required parameter #' @export -setMethod("familyClient", "OpencgaR", function(OpencgaR, family, members, annotationSet, families, endpointName, params=NULL, ...) { +setMethod("familyClient", "OpencgaR", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/families/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/File-methods.R b/opencga-client/src/main/R/R/File-methods.R index f99abec5c6a..aa5d9a763a1 100644 --- a/opencga-client/src/main/R/R/File-methods.R +++ b/opencga-client/src/main/R/R/File-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -54,7 +54,7 @@ #' [*]: Required parameter #' @export -setMethod("fileClient", "OpencgaR", function(OpencgaR, members, annotationSet, files, folder, file, endpointName, params=NULL, ...) { +setMethod("fileClient", "OpencgaR", function(OpencgaR, members, folder, file, files, annotationSet, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/files/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/GA4GH-methods.R b/opencga-client/src/main/R/R/GA4GH-methods.R index 6c33f10e805..0a240e6d6a3 100644 --- a/opencga-client/src/main/R/R/GA4GH-methods.R +++ b/opencga-client/src/main/R/R/GA4GH-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Individual-methods.R b/opencga-client/src/main/R/R/Individual-methods.R index 8425d762354..0c81ab901f7 100644 --- a/opencga-client/src/main/R/R/Individual-methods.R +++ b/opencga-client/src/main/R/R/Individual-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -39,7 +39,7 @@ #' [*]: Required parameter #' @export -setMethod("individualClient", "OpencgaR", function(OpencgaR, annotationSet, members, individual, individuals, endpointName, params=NULL, ...) { +setMethod("individualClient", "OpencgaR", function(OpencgaR, members, annotationSet, individuals, individual, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/individuals/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Job-methods.R b/opencga-client/src/main/R/R/Job-methods.R index eecb9ef55ee..44abcff66ef 100644 --- a/opencga-client/src/main/R/R/Job-methods.R +++ b/opencga-client/src/main/R/R/Job-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -40,7 +40,7 @@ #' [*]: Required parameter #' @export -setMethod("jobClient", "OpencgaR", function(OpencgaR, members, job, jobs, endpointName, params=NULL, ...) { +setMethod("jobClient", "OpencgaR", function(OpencgaR, jobs, members, job, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/jobs/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Meta-methods.R b/opencga-client/src/main/R/R/Meta-methods.R index dc99ac4767f..d8fa6d73da6 100644 --- a/opencga-client/src/main/R/R/Meta-methods.R +++ b/opencga-client/src/main/R/R/Meta-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Operation-methods.R b/opencga-client/src/main/R/R/Operation-methods.R index c5e5da6eb2f..5347a1eca81 100644 --- a/opencga-client/src/main/R/R/Operation-methods.R +++ b/opencga-client/src/main/R/R/Operation-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Panel-methods.R b/opencga-client/src/main/R/R/Panel-methods.R index 6c3328e544c..cd408e39313 100644 --- a/opencga-client/src/main/R/R/Panel-methods.R +++ b/opencga-client/src/main/R/R/Panel-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -36,7 +36,7 @@ #' [*]: Required parameter #' @export -setMethod("panelClient", "OpencgaR", function(OpencgaR, members, panels, endpointName, params=NULL, ...) { +setMethod("panelClient", "OpencgaR", function(OpencgaR, panels, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/panels/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Project-methods.R b/opencga-client/src/main/R/R/Project-methods.R index f4126c3670d..4af959c7597 100644 --- a/opencga-client/src/main/R/R/Project-methods.R +++ b/opencga-client/src/main/R/R/Project-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -34,7 +34,7 @@ #' [*]: Required parameter #' @export -setMethod("projectClient", "OpencgaR", function(OpencgaR, projects, project, endpointName, params=NULL, ...) { +setMethod("projectClient", "OpencgaR", function(OpencgaR, project, projects, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/projects/create: diff --git a/opencga-client/src/main/R/R/Sample-methods.R b/opencga-client/src/main/R/R/Sample-methods.R index 055fb46a729..dac7f36ccbd 100644 --- a/opencga-client/src/main/R/R/Sample-methods.R +++ b/opencga-client/src/main/R/R/Sample-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -39,7 +39,7 @@ #' [*]: Required parameter #' @export -setMethod("sampleClient", "OpencgaR", function(OpencgaR, samples, members, sample, annotationSet, endpointName, params=NULL, ...) { +setMethod("sampleClient", "OpencgaR", function(OpencgaR, annotationSet, members, sample, samples, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/samples/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Study-methods.R b/opencga-client/src/main/R/R/Study-methods.R index e816b97a05f..cbce8be6beb 100644 --- a/opencga-client/src/main/R/R/Study-methods.R +++ b/opencga-client/src/main/R/R/Study-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -46,7 +46,7 @@ #' [*]: Required parameter #' @export -setMethod("studyClient", "OpencgaR", function(OpencgaR, members, templateId, group, studies, variableSet, study, endpointName, params=NULL, ...) { +setMethod("studyClient", "OpencgaR", function(OpencgaR, studies, members, templateId, study, variableSet, group, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/studies/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/User-methods.R b/opencga-client/src/main/R/R/User-methods.R index 908e172768b..3505c6cffc5 100644 --- a/opencga-client/src/main/R/R/User-methods.R +++ b/opencga-client/src/main/R/R/User-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -38,7 +38,7 @@ #' [*]: Required parameter #' @export -setMethod("userClient", "OpencgaR", function(OpencgaR, filterId, user, users, endpointName, params=NULL, ...) { +setMethod("userClient", "OpencgaR", function(OpencgaR, user, users, filterId, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/users/login: diff --git a/opencga-client/src/main/R/R/Variant-methods.R b/opencga-client/src/main/R/R/Variant-methods.R index 86b24f1e3d2..71116af6b8c 100644 --- a/opencga-client/src/main/R/R/Variant-methods.R +++ b/opencga-client/src/main/R/R/Variant-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2023-12-15 +# Autogenerated on: 2024-01-30 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java index 5861b2857e5..226785e12de 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -45,7 +45,7 @@ /** * This class contains methods for the Admin webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: admin */ public class AdminClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java index c9c840941a1..9f1fe0c3762 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -49,7 +49,7 @@ /** * This class contains methods for the Alignment webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: analysis/alignment */ public class AlignmentClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java index 600f937bb50..2a536a0200b 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ import org.opencb.opencga.core.models.clinical.ClinicalAnalysisAclUpdateParams; import org.opencb.opencga.core.models.clinical.ClinicalAnalysisCreateParams; import org.opencb.opencga.core.models.clinical.ClinicalAnalysisUpdateParams; +import org.opencb.opencga.core.models.clinical.ClinicalReport; import org.opencb.opencga.core.models.clinical.ExomiserInterpretationAnalysisParams; import org.opencb.opencga.core.models.clinical.Interpretation; import org.opencb.opencga.core.models.clinical.InterpretationCreateParams; @@ -53,7 +54,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -62,7 +63,7 @@ /** * This class contains methods for the ClinicalAnalysis webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: analysis/clinical */ public class ClinicalAnalysisClient extends AbstractParentClient { @@ -978,4 +979,26 @@ public RestResponse updateInterpretation(String clinicalAnalysis return execute("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "update", params, POST, Interpretation.class); } + + /** + * Update clinical analysis report. + * @param clinicalAnalysis Clinical analysis ID. + * @param data JSON containing clinical report information. + * @param params Map containing any of the following optional parameters. + * include: Fields included in the response, whole JSON path must be provided. + * exclude: Fields excluded in the response, whole JSON path must be provided. + * study: Study [[user@]project:]study where study and project can be either the ID or UUID. + * commentsAction: Action to be performed if the array of comments is being updated. + * supportingEvidencesAction: Action to be performed if the array of supporting evidences is being updated. + * filesAction: Action to be performed if the array of files is being updated. + * includeResult: Flag indicating to include the created or updated document result in the response. + * @return a RestResponse object. + * @throws ClientException ClientException if there is any server error. + */ + public RestResponse updateReport(String clinicalAnalysis, ClinicalReport data, ObjectMap params) + throws ClientException { + params = params != null ? params : new ObjectMap(); + params.put("body", data); + return execute("analysis/clinical", clinicalAnalysis, "report", null, "update", params, POST, ClinicalReport.class); + } } diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java index 7551de54734..e70f528ead2 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -46,7 +46,7 @@ /** * This class contains methods for the Cohort webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: cohorts */ public class CohortClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java index a2d2294288f..ddbc803466a 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -44,7 +44,7 @@ /** * This class contains methods for the DiseasePanel webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: panels */ public class DiseasePanelClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java index 3864e673c1c..bbd0ece17d3 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -45,7 +45,7 @@ /** * This class contains methods for the Family webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: families */ public class FamilyClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java index e31b21892cf..d180259c267 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -52,7 +52,7 @@ /** * This class contains methods for the File webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: files */ public class FileClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java index 8ed457c91fa..792bd4512cf 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -36,7 +36,7 @@ /** * This class contains methods for the GA4GH webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: ga4gh */ public class GA4GHClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java index 2d62e0d63c9..39d0f05a7c5 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -45,7 +45,7 @@ /** * This class contains methods for the Individual webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: individuals */ public class IndividualClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java index 0847486e2f3..93cc6bd33b5 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -46,7 +46,7 @@ /** * This class contains methods for the Job webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: jobs */ public class JobClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java index 00f596604e2..c00a5087087 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -37,7 +37,7 @@ /** * This class contains methods for the Meta webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: meta */ public class MetaClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java index 93ff43c9374..d3f6a379f3a 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -41,7 +41,7 @@ /** * This class contains methods for the Project webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: projects */ public class ProjectClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java index 68cf5b5bd88..fd4789a4dc4 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -45,7 +45,7 @@ /** * This class contains methods for the Sample webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: samples */ public class SampleClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java index 29e8f294907..c537f9b4227 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -54,7 +54,7 @@ /** * This class contains methods for the Study webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: studies */ public class StudyClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java index 0494c7c07be..0a6620159a8 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -45,7 +45,7 @@ /** * This class contains methods for the User webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: users */ public class UserClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java index 9abf7befe41..bb2741388d7 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -71,7 +71,7 @@ /** * This class contains methods for the Variant webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: analysis/variant */ public class VariantClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java index 8928db2a550..66d77561bba 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2023 OpenCB +* Copyright 2015-2024 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2023-12-15 +* Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -59,7 +59,7 @@ /** * This class contains methods for the VariantOperation webservices. - * Client version: 2.12.1-SNAPSHOT + * Client version: 2.12.2-SNAPSHOT * PATH: operation */ public class VariantOperationClient extends AbstractParentClient { diff --git a/opencga-client/src/main/javascript/Admin.js b/opencga-client/src/main/javascript/Admin.js index 72ee4c5d577..d533d8eb0ba 100644 --- a/opencga-client/src/main/javascript/Admin.js +++ b/opencga-client/src/main/javascript/Admin.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Alignment.js b/opencga-client/src/main/javascript/Alignment.js index 93ee35f4d5d..b4847e1dac0 100644 --- a/opencga-client/src/main/javascript/Alignment.js +++ b/opencga-client/src/main/javascript/Alignment.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/ClinicalAnalysis.js b/opencga-client/src/main/javascript/ClinicalAnalysis.js index 79e9a43e96f..3430f69661a 100644 --- a/opencga-client/src/main/javascript/ClinicalAnalysis.js +++ b/opencga-client/src/main/javascript/ClinicalAnalysis.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -845,4 +845,25 @@ export default class ClinicalAnalysis extends OpenCGAParentClass { return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "update", data, params); } + /** Update clinical analysis report + * @param {String} clinicalAnalysis - Clinical analysis ID. + * @param {Object} data - JSON containing clinical report information. + * @param {Object} [params] - The Object containing the following optional parameters: + * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. + * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. + * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. + * @param {"ADD REMOVE REPLACE"} [params.commentsAction = "ADD"] - Action to be performed if the array of comments is being updated. The + * default value is ADD. + * @param {"ADD SET REMOVE"} [params.supportingEvidencesAction = "ADD"] - Action to be performed if the array of supporting evidences is + * being updated. The default value is ADD. + * @param {"ADD SET REMOVE"} [params.filesAction = "ADD"] - Action to be performed if the array of files is being updated. The default + * value is ADD. + * @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response. + * The default value is false. + * @returns {Promise} Promise object in the form of RestResponse instance. + */ + updateReport(clinicalAnalysis, data, params) { + return this._post("analysis/clinical", clinicalAnalysis, "report", null, "update", data, params); + } + } \ No newline at end of file diff --git a/opencga-client/src/main/javascript/Cohort.js b/opencga-client/src/main/javascript/Cohort.js index b08e27f1127..badd624d5ae 100644 --- a/opencga-client/src/main/javascript/Cohort.js +++ b/opencga-client/src/main/javascript/Cohort.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/DiseasePanel.js b/opencga-client/src/main/javascript/DiseasePanel.js index db336df392c..628b7c44bf2 100644 --- a/opencga-client/src/main/javascript/DiseasePanel.js +++ b/opencga-client/src/main/javascript/DiseasePanel.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Family.js b/opencga-client/src/main/javascript/Family.js index 1531a41b607..5488744f8cd 100644 --- a/opencga-client/src/main/javascript/Family.js +++ b/opencga-client/src/main/javascript/Family.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/File.js b/opencga-client/src/main/javascript/File.js index 660d3f3733c..54ab6b38608 100644 --- a/opencga-client/src/main/javascript/File.js +++ b/opencga-client/src/main/javascript/File.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/GA4GH.js b/opencga-client/src/main/javascript/GA4GH.js index 7eb8bb8f1ac..fcce4ffa025 100644 --- a/opencga-client/src/main/javascript/GA4GH.js +++ b/opencga-client/src/main/javascript/GA4GH.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Individual.js b/opencga-client/src/main/javascript/Individual.js index 43f3cd2e2ed..6b8f1ecd931 100644 --- a/opencga-client/src/main/javascript/Individual.js +++ b/opencga-client/src/main/javascript/Individual.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Job.js b/opencga-client/src/main/javascript/Job.js index 9273b924274..c92fb36da73 100644 --- a/opencga-client/src/main/javascript/Job.js +++ b/opencga-client/src/main/javascript/Job.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Meta.js b/opencga-client/src/main/javascript/Meta.js index fb5f1f99602..1fae236ef72 100644 --- a/opencga-client/src/main/javascript/Meta.js +++ b/opencga-client/src/main/javascript/Meta.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Project.js b/opencga-client/src/main/javascript/Project.js index 61cfe76321a..a1a491cfc74 100644 --- a/opencga-client/src/main/javascript/Project.js +++ b/opencga-client/src/main/javascript/Project.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Sample.js b/opencga-client/src/main/javascript/Sample.js index b28d8147fb9..f0e3976fcfd 100644 --- a/opencga-client/src/main/javascript/Sample.js +++ b/opencga-client/src/main/javascript/Sample.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Study.js b/opencga-client/src/main/javascript/Study.js index 11d0ae3b98e..183cf9ac13a 100644 --- a/opencga-client/src/main/javascript/Study.js +++ b/opencga-client/src/main/javascript/Study.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/User.js b/opencga-client/src/main/javascript/User.js index 90615f3cca2..533db2eada8 100644 --- a/opencga-client/src/main/javascript/User.js +++ b/opencga-client/src/main/javascript/User.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Variant.js b/opencga-client/src/main/javascript/Variant.js index 9a3df7f9fd1..9bf3047933e 100644 --- a/opencga-client/src/main/javascript/Variant.js +++ b/opencga-client/src/main/javascript/Variant.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/VariantOperation.js b/opencga-client/src/main/javascript/VariantOperation.js index 30c9ad7bbc0..a64b11f4c83 100644 --- a/opencga-client/src/main/javascript/VariantOperation.js +++ b/opencga-client/src/main/javascript/VariantOperation.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2023-12-15 + * Autogenerated on: 2024-01-30 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py index e976c0681a9..343834c5ef7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Admin(_ParentRestClient): """ This class contains methods for the 'Admin' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/admin """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py index a0f056eee50..c400a3b2fd1 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Alignment(_ParentRestClient): """ This class contains methods for the 'Analysis - Alignment' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/analysis/alignment """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py index feade5634db..f53c3ec76af 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class ClinicalAnalysis(_ParentRestClient): """ This class contains methods for the 'Analysis - Clinical' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/analysis/clinical """ @@ -1069,3 +1069,30 @@ def update_interpretation(self, clinical_analysis, interpretation, data=None, ** return self._post(category='analysis/clinical', resource='update', query_id=clinical_analysis, subcategory='interpretation', second_query_id=interpretation, data=data, **options) + def update_report(self, clinical_analysis, data=None, **options): + """ + Update clinical analysis report. + PATH: /{apiVersion}/analysis/clinical/{clinicalAnalysis}/report/update + + :param dict data: JSON containing clinical report information. + (REQUIRED) + :param str clinical_analysis: Clinical analysis ID. (REQUIRED) + :param str include: Fields included in the response, whole JSON path + must be provided. + :param str exclude: Fields excluded in the response, whole JSON path + must be provided. + :param str study: Study [[user@]project:]study where study and project + can be either the ID or UUID. + :param str comments_action: Action to be performed if the array of + comments is being updated. Allowed values: ['ADD REMOVE REPLACE'] + :param str supporting_evidences_action: Action to be performed if the + array of supporting evidences is being updated. Allowed values: + ['ADD SET REMOVE'] + :param str files_action: Action to be performed if the array of files + is being updated. Allowed values: ['ADD SET REMOVE'] + :param bool include_result: Flag indicating to include the created or + updated document result in the response. + """ + + return self._post(category='analysis/clinical', resource='update', query_id=clinical_analysis, subcategory='report', data=data, **options) + diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py index a9987346408..677706b1e58 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Cohort(_ParentRestClient): """ This class contains methods for the 'Cohorts' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/cohorts """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py index cbdf3677d81..a8ae201e7ef 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class DiseasePanel(_ParentRestClient): """ This class contains methods for the 'Disease Panels' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/panels """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py index b2567e84331..cc9fa767f0f 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Family(_ParentRestClient): """ This class contains methods for the 'Families' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/families """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py index 78303d714e9..c72e0ffd925 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class File(_ParentRestClient): """ This class contains methods for the 'Files' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/files """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py index 8225d5bf86f..86d7747f04b 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class GA4GH(_ParentRestClient): """ This class contains methods for the 'GA4GH' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/ga4gh """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py index 36a740bb26b..db1015702ce 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Individual(_ParentRestClient): """ This class contains methods for the 'Individuals' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/individuals """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py index 2fadce8f58f..838451d7ea4 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Job(_ParentRestClient): """ This class contains methods for the 'Jobs' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/jobs """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py index 56b398093e8..a105a0c620b 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Meta(_ParentRestClient): """ This class contains methods for the 'Meta' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/meta """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py index 7e316925332..610283c05e9 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Project(_ParentRestClient): """ This class contains methods for the 'Projects' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/projects """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py index 7cf5749d831..6cece56e1a9 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Sample(_ParentRestClient): """ This class contains methods for the 'Samples' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/samples """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py index c2ad691a6db..594beda62f7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Study(_ParentRestClient): """ This class contains methods for the 'Studies' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/studies """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py index af27dabb31d..cc09130e3a1 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class User(_ParentRestClient): """ This class contains methods for the 'Users' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/users """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py index d0e7be2e397..1709580dcc7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class Variant(_ParentRestClient): """ This class contains methods for the 'Analysis - Variant' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/analysis/variant """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py index c86d4e49b34..56a41020056 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2023-12-15 + Autogenerated on: 2024-01-30 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -14,7 +14,7 @@ class VariantOperation(_ParentRestClient): """ This class contains methods for the 'Operations - Variant Storage' webservices - Client version: 2.12.1-SNAPSHOT + Client version: 2.12.2-SNAPSHOT PATH: /{apiVersion}/operation """ From aaf7129dc5b6c5904e236352a4b676111b5e3419 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 2 Feb 2024 14:08:39 +0100 Subject: [PATCH 11/16] client: Autogerated classes to Fix meta/model client #TASK-5580 --- .../app/cli/main/OpenCgaCompleter.java | 2 +- .../app/cli/main/OpencgaCliOptionsParser.java | 2 +- .../main/executors/MetaCommandExecutor.java | 6 +- .../cli/main/options/MetaCommandOptions.java | 3 + opencga-client/src/main/R/R/Admin-methods.R | 2 +- .../src/main/R/R/Alignment-methods.R | 2 +- opencga-client/src/main/R/R/AllGenerics.R | 14 +- .../src/main/R/R/Clinical-methods.R | 4 +- opencga-client/src/main/R/R/Cohort-methods.R | 4 +- opencga-client/src/main/R/R/Family-methods.R | 4 +- opencga-client/src/main/R/R/File-methods.R | 4 +- opencga-client/src/main/R/R/GA4GH-methods.R | 2 +- .../src/main/R/R/Individual-methods.R | 4 +- opencga-client/src/main/R/R/Job-methods.R | 2 +- opencga-client/src/main/R/R/Meta-methods.R | 6 +- .../src/main/R/R/Operation-methods.R | 2 +- opencga-client/src/main/R/R/Panel-methods.R | 2 +- opencga-client/src/main/R/R/Project-methods.R | 4 +- opencga-client/src/main/R/R/Sample-methods.R | 2 +- opencga-client/src/main/R/R/Study-methods.R | 4 +- opencga-client/src/main/R/R/User-methods.R | 2 +- opencga-client/src/main/R/R/Variant-methods.R | 2 +- .../client/rest/clients/AdminClient.java | 2 +- .../client/rest/clients/AlignmentClient.java | 2 +- .../rest/clients/ClinicalAnalysisClient.java | 2 +- .../client/rest/clients/CohortClient.java | 2 +- .../rest/clients/DiseasePanelClient.java | 2 +- .../client/rest/clients/FamilyClient.java | 2 +- .../client/rest/clients/FileClient.java | 2 +- .../client/rest/clients/GA4GHClient.java | 2 +- .../client/rest/clients/IndividualClient.java | 2 +- .../client/rest/clients/JobClient.java | 2 +- .../client/rest/clients/MetaClient.java | 8 +- .../client/rest/clients/ProjectClient.java | 2 +- .../client/rest/clients/SampleClient.java | 2 +- .../client/rest/clients/StudyClient.java | 2 +- .../client/rest/clients/UserClient.java | 2 +- .../client/rest/clients/VariantClient.java | 2 +- .../rest/clients/VariantOperationClient.java | 2 +- opencga-client/src/main/javascript/Admin.js | 2 +- .../src/main/javascript/Alignment.js | 2 +- .../src/main/javascript/Clinical.js | 807 ------------------ .../src/main/javascript/ClinicalAnalysis.js | 2 +- opencga-client/src/main/javascript/Cohort.js | 2 +- .../src/main/javascript/DiseasePanel.js | 2 +- opencga-client/src/main/javascript/Family.js | 2 +- opencga-client/src/main/javascript/File.js | 2 +- opencga-client/src/main/javascript/GA4GH.js | 2 +- .../src/main/javascript/Individual.js | 2 +- opencga-client/src/main/javascript/Job.js | 2 +- opencga-client/src/main/javascript/Meta.js | 9 +- opencga-client/src/main/javascript/Project.js | 2 +- opencga-client/src/main/javascript/Sample.js | 2 +- opencga-client/src/main/javascript/Study.js | 2 +- opencga-client/src/main/javascript/User.js | 2 +- opencga-client/src/main/javascript/Variant.js | 2 +- .../src/main/javascript/VariantOperation.js | 2 +- .../pyopencga/rest_clients/admin_client.py | 2 +- .../rest_clients/alignment_client.py | 2 +- .../rest_clients/clinical_analysis_client.py | 2 +- .../pyopencga/rest_clients/cohort_client.py | 2 +- .../rest_clients/disease_panel_client.py | 2 +- .../pyopencga/rest_clients/family_client.py | 2 +- .../pyopencga/rest_clients/file_client.py | 2 +- .../pyopencga/rest_clients/ga4gh_client.py | 2 +- .../rest_clients/individual_client.py | 2 +- .../pyopencga/rest_clients/job_client.py | 2 +- .../pyopencga/rest_clients/meta_client.py | 4 +- .../pyopencga/rest_clients/project_client.py | 2 +- .../pyopencga/rest_clients/sample_client.py | 2 +- .../pyopencga/rest_clients/study_client.py | 2 +- .../pyopencga/rest_clients/user_client.py | 2 +- .../pyopencga/rest_clients/variant_client.py | 2 +- .../rest_clients/variant_operation_client.py | 2 +- .../opencga/server/rest/MetaWSServer.java | 2 +- 75 files changed, 105 insertions(+), 900 deletions(-) delete mode 100644 opencga-client/src/main/javascript/Clinical.js diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java index 31d1c757700..ff4d1cda0d9 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2024-01-30 OpenCB +* Copyright 2015-2024-02-02 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java index fe013c129cd..b783ac8c631 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java @@ -1,5 +1,5 @@ /* -* Copyright 2015-2024-01-30 OpenCB +* Copyright 2015-2024-02-02 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/MetaCommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/MetaCommandExecutor.java index 0d8987f61d6..3a674a32c68 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/MetaCommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/executors/MetaCommandExecutor.java @@ -106,7 +106,11 @@ private RestResponse model() throws Exception { logger.debug("Executing model in Meta command line"); MetaCommandOptions.ModelCommandOptions commandOptions = metaCommandOptions.modelCommandOptions; - return openCGAClient.getMetaClient().model(); + + ObjectMap queryParams = new ObjectMap(); + queryParams.putIfNotEmpty("model", commandOptions.model); + + return openCGAClient.getMetaClient().model(queryParams); } private RestResponse ping() throws Exception { diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/MetaCommandOptions.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/MetaCommandOptions.java index 4cb695c9e32..c72e4325362 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/MetaCommandOptions.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/MetaCommandOptions.java @@ -87,6 +87,9 @@ public class ModelCommandOptions { @ParametersDelegate public CommonCommandOptions commonOptions = commonCommandOptions; + @Parameter(names = {"--model"}, description = "Model description", required = false, arity = 1) + public String model; + } @Parameters(commandNames = {"ping"}, commandDescription ="Ping Opencga webservices.") diff --git a/opencga-client/src/main/R/R/Admin-methods.R b/opencga-client/src/main/R/R/Admin-methods.R index cd6c1bd235a..16934e37c0a 100644 --- a/opencga-client/src/main/R/R/Admin-methods.R +++ b/opencga-client/src/main/R/R/Admin-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Alignment-methods.R b/opencga-client/src/main/R/R/Alignment-methods.R index a3110d0b076..6cf06517077 100644 --- a/opencga-client/src/main/R/R/Alignment-methods.R +++ b/opencga-client/src/main/R/R/Alignment-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/AllGenerics.R b/opencga-client/src/main/R/R/AllGenerics.R index 177a61e827a..3b8fbf19e0a 100644 --- a/opencga-client/src/main/R/R/AllGenerics.R +++ b/opencga-client/src/main/R/R/AllGenerics.R @@ -5,17 +5,17 @@ setGeneric("userClient", function(OpencgaR, user, users, filterId, endpointName, # ############################################################################## ## ProjectClient -setGeneric("projectClient", function(OpencgaR, project, projects, endpointName, params=NULL, ...) +setGeneric("projectClient", function(OpencgaR, projects, project, endpointName, params=NULL, ...) standardGeneric("projectClient")) # ############################################################################## ## StudyClient -setGeneric("studyClient", function(OpencgaR, studies, members, templateId, study, variableSet, group, endpointName, params=NULL, ...) +setGeneric("studyClient", function(OpencgaR, members, study, group, variableSet, templateId, studies, endpointName, params=NULL, ...) standardGeneric("studyClient")) # ############################################################################## ## FileClient -setGeneric("fileClient", function(OpencgaR, members, folder, file, files, annotationSet, endpointName, params=NULL, ...) +setGeneric("fileClient", function(OpencgaR, members, folder, file, annotationSet, files, endpointName, params=NULL, ...) standardGeneric("fileClient")) # ############################################################################## @@ -30,17 +30,17 @@ setGeneric("sampleClient", function(OpencgaR, annotationSet, members, sample, sa # ############################################################################## ## IndividualClient -setGeneric("individualClient", function(OpencgaR, members, annotationSet, individuals, individual, endpointName, params=NULL, ...) +setGeneric("individualClient", function(OpencgaR, individual, annotationSet, members, individuals, endpointName, params=NULL, ...) standardGeneric("individualClient")) # ############################################################################## ## FamilyClient -setGeneric("familyClient", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) +setGeneric("familyClient", function(OpencgaR, families, annotationSet, members, family, endpointName, params=NULL, ...) standardGeneric("familyClient")) # ############################################################################## ## CohortClient -setGeneric("cohortClient", function(OpencgaR, cohort, annotationSet, members, cohorts, endpointName, params=NULL, ...) +setGeneric("cohortClient", function(OpencgaR, annotationSet, members, cohort, cohorts, endpointName, params=NULL, ...) standardGeneric("cohortClient")) # ############################################################################## @@ -60,7 +60,7 @@ setGeneric("variantClient", function(OpencgaR, endpointName, params=NULL, ...) # ############################################################################## ## ClinicalClient -setGeneric("clinicalClient", function(OpencgaR, members, interpretations, clinicalAnalysis, interpretation, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) +setGeneric("clinicalClient", function(OpencgaR, interpretations, members, interpretation, clinicalAnalysis, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) standardGeneric("clinicalClient")) # ############################################################################## diff --git a/opencga-client/src/main/R/R/Clinical-methods.R b/opencga-client/src/main/R/R/Clinical-methods.R index 9184f341a42..6bcb2f2b22b 100644 --- a/opencga-client/src/main/R/R/Clinical-methods.R +++ b/opencga-client/src/main/R/R/Clinical-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -61,7 +61,7 @@ #' [*]: Required parameter #' @export -setMethod("clinicalClient", "OpencgaR", function(OpencgaR, members, interpretations, clinicalAnalysis, interpretation, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) { +setMethod("clinicalClient", "OpencgaR", function(OpencgaR, interpretations, members, interpretation, clinicalAnalysis, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/analysis/clinical/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Cohort-methods.R b/opencga-client/src/main/R/R/Cohort-methods.R index ff52e896b22..c18e887d317 100644 --- a/opencga-client/src/main/R/R/Cohort-methods.R +++ b/opencga-client/src/main/R/R/Cohort-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -39,7 +39,7 @@ #' [*]: Required parameter #' @export -setMethod("cohortClient", "OpencgaR", function(OpencgaR, cohort, annotationSet, members, cohorts, endpointName, params=NULL, ...) { +setMethod("cohortClient", "OpencgaR", function(OpencgaR, annotationSet, members, cohort, cohorts, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/cohorts/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Family-methods.R b/opencga-client/src/main/R/R/Family-methods.R index a0ae9ced80d..9320d10c540 100644 --- a/opencga-client/src/main/R/R/Family-methods.R +++ b/opencga-client/src/main/R/R/Family-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -38,7 +38,7 @@ #' [*]: Required parameter #' @export -setMethod("familyClient", "OpencgaR", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) { +setMethod("familyClient", "OpencgaR", function(OpencgaR, families, annotationSet, members, family, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/families/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/File-methods.R b/opencga-client/src/main/R/R/File-methods.R index aa5d9a763a1..132fa43c0dd 100644 --- a/opencga-client/src/main/R/R/File-methods.R +++ b/opencga-client/src/main/R/R/File-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -54,7 +54,7 @@ #' [*]: Required parameter #' @export -setMethod("fileClient", "OpencgaR", function(OpencgaR, members, folder, file, files, annotationSet, endpointName, params=NULL, ...) { +setMethod("fileClient", "OpencgaR", function(OpencgaR, members, folder, file, annotationSet, files, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/files/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/GA4GH-methods.R b/opencga-client/src/main/R/R/GA4GH-methods.R index 0a240e6d6a3..5a37a5dc5c4 100644 --- a/opencga-client/src/main/R/R/GA4GH-methods.R +++ b/opencga-client/src/main/R/R/GA4GH-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Individual-methods.R b/opencga-client/src/main/R/R/Individual-methods.R index 0c81ab901f7..85433cf5129 100644 --- a/opencga-client/src/main/R/R/Individual-methods.R +++ b/opencga-client/src/main/R/R/Individual-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -39,7 +39,7 @@ #' [*]: Required parameter #' @export -setMethod("individualClient", "OpencgaR", function(OpencgaR, members, annotationSet, individuals, individual, endpointName, params=NULL, ...) { +setMethod("individualClient", "OpencgaR", function(OpencgaR, individual, annotationSet, members, individuals, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/individuals/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Job-methods.R b/opencga-client/src/main/R/R/Job-methods.R index 44abcff66ef..d17aaa553a7 100644 --- a/opencga-client/src/main/R/R/Job-methods.R +++ b/opencga-client/src/main/R/R/Job-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Meta-methods.R b/opencga-client/src/main/R/R/Meta-methods.R index d8fa6d73da6..94a18107431 100644 --- a/opencga-client/src/main/R/R/Meta-methods.R +++ b/opencga-client/src/main/R/R/Meta-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -23,7 +23,7 @@ #' | about | /{apiVersion}/meta/about | | #' | api | /{apiVersion}/meta/api | category | #' | fail | /{apiVersion}/meta/fail | | -#' | model | /{apiVersion}/meta/model | | +#' | model | /{apiVersion}/meta/model | model | #' | ping | /{apiVersion}/meta/ping | | #' | status | /{apiVersion}/meta/status | | #' @@ -56,7 +56,7 @@ setMethod("metaClient", "OpencgaR", function(OpencgaR, endpointName, params=NULL #' @section Endpoint /{apiVersion}/meta/model: #' Opencga model webservices. - + #' @param model Model description. model=fetchOpenCGA(object=OpencgaR, category="meta", categoryId=NULL, subcategory=NULL, subcategoryId=NULL, action="model", params=params, httpMethod="GET", as.queryParam=NULL, ...), diff --git a/opencga-client/src/main/R/R/Operation-methods.R b/opencga-client/src/main/R/R/Operation-methods.R index 5347a1eca81..6b7ce28a8c6 100644 --- a/opencga-client/src/main/R/R/Operation-methods.R +++ b/opencga-client/src/main/R/R/Operation-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Panel-methods.R b/opencga-client/src/main/R/R/Panel-methods.R index cd408e39313..ec0aba4e3df 100644 --- a/opencga-client/src/main/R/R/Panel-methods.R +++ b/opencga-client/src/main/R/R/Panel-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Project-methods.R b/opencga-client/src/main/R/R/Project-methods.R index 4af959c7597..fc4593e0459 100644 --- a/opencga-client/src/main/R/R/Project-methods.R +++ b/opencga-client/src/main/R/R/Project-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -34,7 +34,7 @@ #' [*]: Required parameter #' @export -setMethod("projectClient", "OpencgaR", function(OpencgaR, project, projects, endpointName, params=NULL, ...) { +setMethod("projectClient", "OpencgaR", function(OpencgaR, projects, project, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/projects/create: diff --git a/opencga-client/src/main/R/R/Sample-methods.R b/opencga-client/src/main/R/R/Sample-methods.R index dac7f36ccbd..1ef209a32ec 100644 --- a/opencga-client/src/main/R/R/Sample-methods.R +++ b/opencga-client/src/main/R/R/Sample-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Study-methods.R b/opencga-client/src/main/R/R/Study-methods.R index cbce8be6beb..c2b9b912241 100644 --- a/opencga-client/src/main/R/R/Study-methods.R +++ b/opencga-client/src/main/R/R/Study-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -46,7 +46,7 @@ #' [*]: Required parameter #' @export -setMethod("studyClient", "OpencgaR", function(OpencgaR, studies, members, templateId, study, variableSet, group, endpointName, params=NULL, ...) { +setMethod("studyClient", "OpencgaR", function(OpencgaR, members, study, group, variableSet, templateId, studies, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/studies/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/User-methods.R b/opencga-client/src/main/R/R/User-methods.R index 3505c6cffc5..17acf92aff0 100644 --- a/opencga-client/src/main/R/R/User-methods.R +++ b/opencga-client/src/main/R/R/User-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Variant-methods.R b/opencga-client/src/main/R/R/Variant-methods.R index 71116af6b8c..f2dc429c877 100644 --- a/opencga-client/src/main/R/R/Variant-methods.R +++ b/opencga-client/src/main/R/R/Variant-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-01-30 +# Autogenerated on: 2024-02-02 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java index 226785e12de..df91987ff7f 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java index 9f1fe0c3762..1a3cbd6e61c 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java @@ -40,7 +40,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java index 2a536a0200b..f98b6d7c58e 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java @@ -54,7 +54,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java index e70f528ead2..fb16691423c 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java @@ -37,7 +37,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java index ddbc803466a..2cf832703f8 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java @@ -35,7 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java index bbd0ece17d3..129b4b14705 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java index d180259c267..06ae8e4b9c7 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java @@ -43,7 +43,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java index 792bd4512cf..2af3d0c9e28 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java @@ -27,7 +27,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java index 39d0f05a7c5..0f1413db069 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java index 93cc6bd33b5..c15fa77699f 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java @@ -37,7 +37,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java index c00a5087087..baadc9f1b8a 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java @@ -28,7 +28,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -80,11 +80,13 @@ public RestResponse fail() throws ClientException { /** * Opencga model webservices. + * @param params Map containing any of the following optional parameters. + * model: Model description. * @return a RestResponse object. * @throws ClientException ClientException if there is any server error. */ - public RestResponse model() throws ClientException { - ObjectMap params = new ObjectMap(); + public RestResponse model(ObjectMap params) throws ClientException { + params = params != null ? params : new ObjectMap(); return execute("meta", null, null, null, "model", params, GET, String.class); } diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java index d3f6a379f3a..9a2f3b27f1b 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java @@ -32,7 +32,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java index fd4789a4dc4..7387954d23c 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java index c537f9b4227..eccd24ddd6a 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java @@ -45,7 +45,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java index 0a6620159a8..509de9c2944 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java @@ -36,7 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java index bb2741388d7..a7a369dcd46 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java @@ -62,7 +62,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java index 66d77561bba..594a79f83bf 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java @@ -50,7 +50,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-01-30 +* Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Admin.js b/opencga-client/src/main/javascript/Admin.js index d533d8eb0ba..05a71e5ced1 100644 --- a/opencga-client/src/main/javascript/Admin.js +++ b/opencga-client/src/main/javascript/Admin.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Alignment.js b/opencga-client/src/main/javascript/Alignment.js index b4847e1dac0..1075d6d854c 100644 --- a/opencga-client/src/main/javascript/Alignment.js +++ b/opencga-client/src/main/javascript/Alignment.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Clinical.js b/opencga-client/src/main/javascript/Clinical.js deleted file mode 100644 index 2c695aacd91..00000000000 --- a/opencga-client/src/main/javascript/Clinical.js +++ /dev/null @@ -1,807 +0,0 @@ -/** - * Copyright 2015-2020 OpenCB - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * WARNING: AUTOGENERATED CODE - * - * This code was generated by a tool. - * Autogenerated on: 2022-08-02 08:25:32 ->>>>>>> develop ->>>>>>> release-2.4.x ->>>>>>> release-2.4.x - * - * Manual changes to this file may cause unexpected behavior in your application. - * Manual changes to this file will be overwritten if the code is regenerated. - * -**/ - -import OpenCGAParentClass from "./../opencga-parent-class.js"; - - -/** - * This class contains the methods for the "Clinical" resource - */ - -export default class Clinical extends OpenCGAParentClass { - - constructor(config) { - super(config); - } - - /** Update the set of permissions granted for the member - * @param {String} members - Comma separated list of user or group IDs. - * @param {Object} data - JSON containing the parameters to add ACLs. - * @param {String} action = "ADD" - Action to be performed [ADD, SET, REMOVE or RESET]. The default value is ADD. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {Boolean} [params.propagate = "false"] - Propagate permissions to related families, individuals, samples and files. The default - * value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - updateAcl(members, action, data, params) { - return this._post("analysis", null, "clinical/acl", members, "update", data, {action, ...params}); - } - - /** Update Clinical Analysis configuration. - * @param {Object} [data] - Configuration params to update. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - updateClinicalConfiguration(data, params) { - return this._post("analysis", null, "clinical/clinical/configuration", null, "update", data, params); - } - - /** Create a new clinical analysis - * @param {Object} data - JSON containing clinical analysis information. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {Boolean} [params.skipCreateDefaultInterpretation] - Flag to skip creating and initialise an empty default primary - * interpretation (Id will be '{clinicalAnalysisId}.1'). This flag is only considered if no Interpretation object is passed. - * @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response. - * The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - create(data, params) { - return this._post("analysis", null, "clinical", null, "create", data, params); - } - - /** Clinical Analysis distinct method - * @param {String} field - Field for which to obtain the distinct values. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.id] - Comma separated list of Clinical Analysis IDs up to a maximum of 100. - * @param {String} [params.uuid] - Comma separated list of Clinical Analysis UUIDs up to a maximum of 100. - * @param {String} [params.type] - Clinical Analysis type. - * @param {String} [params.disorder] - Clinical Analysis disorder. - * @param {String} [params.files] - Clinical Analysis files. - * @param {String} [params.sample] - Sample associated to the proband or any member of a family. - * @param {String} [params.individual] - Proband or any member of a family. - * @param {String} [params.proband] - Clinical Analysis proband. - * @param {String} [params.probandSamples] - Clinical Analysis proband samples. - * @param {String} [params.family] - Clinical Analysis family. - * @param {String} [params.familyMembers] - Clinical Analysis family members. - * @param {String} [params.familyMemberSamples] - Clinical Analysis family members samples. - * @param {String} [params.panels] - Clinical Analysis panels. - * @param {Boolean} [params.locked] - Locked Clinical Analyses. - * @param {String} [params.analystId] - Clinical Analysis analyst id. - * @param {String} [params.priority] - Clinical Analysis priority. - * @param {String} [params.flags] - Clinical Analysis flags. - * @param {String} [params.creationDate] - Clinical Analysis Creation date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.modificationDate] - Clinical Analysis Modification date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, - * <201805. - * @param {String} [params.dueDate] - Clinical Analysis due date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.qualityControlSummary] - Clinical Analysis quality control summary. - * @param {String} [params.release] - Release when it was created. - * @param {String} [params.status] - Filter by status. - * @param {String} [params.internalStatus] - Filter by internal status. - * @param {Boolean} [params.deleted] - Boolean to retrieve deleted entries. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - distinct(field, params) { - return this._get("analysis", null, "clinical", null, "distinct", {field, ...params}); - } - - /** Interpretation distinct method - * @param {String} field - Field for which to obtain the distinct values. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.id] - Comma separated list of Interpretation IDs up to a maximum of 100. - * @param {String} [params.uuid] - Comma separated list of Interpretation UUIDs up to a maximum of 100. - * @param {String} [params.clinicalAnalysisId] - Clinical Analysis id. - * @param {String} [params.analystId] - Analyst ID. - * @param {String} [params.methodName] - Interpretation method name. - * @param {String} [params.panels] - Interpretation panels. - * @param {String} [params.primaryFindings] - Interpretation primary findings. - * @param {String} [params.secondaryFindings] - Interpretation secondary findings. - * @param {String} [params.creationDate] - Interpretation Creation date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.modificationDate] - Interpretation Modification date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, - * <201805. - * @param {String} [params.status] - Filter by status. - * @param {String} [params.internalStatus] - Filter by internal status. - * @param {String} [params.release] - Release when it was created. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - distinctInterpretation(field, params) { - return this._get("analysis", null, "clinical/interpretation", null, "distinct", {field, ...params}); - } - - /** Search clinical interpretations - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.sort] - Sort the results. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.id] - Comma separated list of Interpretation IDs up to a maximum of 100. - * @param {String} [params.uuid] - Comma separated list of Interpretation UUIDs up to a maximum of 100. - * @param {String} [params.clinicalAnalysisId] - Clinical Analysis id. - * @param {String} [params.analystId] - Analyst ID. - * @param {String} [params.methodName] - Interpretation method name. - * @param {String} [params.panels] - Interpretation panels. - * @param {String} [params.primaryFindings] - Interpretation primary findings. - * @param {String} [params.secondaryFindings] - Interpretation secondary findings. - * @param {String} [params.creationDate] - Interpretation Creation date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.modificationDate] - Interpretation Modification date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, - * <201805. - * @param {String} [params.status] - Filter by status. - * @param {String} [params.internalStatus] - Filter by internal status. - * @param {String} [params.release] - Release when it was created. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - searchInterpretation(params) { - return this._get("analysis", null, "clinical/interpretation", null, "search", params); - } - - /** Clinical interpretation information - * @param {String} interpretations - Comma separated list of clinical interpretation IDs up to a maximum of 100. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.version] - Comma separated list of interpretation versions. 'all' to get all the interpretation versions. Not - * supported if multiple interpretation ids are provided. - * @param {Boolean} [params.deleted = "false"] - Boolean to retrieve deleted entries. The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - infoInterpretation(interpretations, params) { - return this._get("analysis", null, "clinical/interpretation", interpretations, "info", params); - } - - /** Run cancer tiering interpretation analysis - * @param {Object} data - Cancer tiering interpretation analysis params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runInterpreterCancerTiering(data, params) { - return this._post("analysis", null, "clinical/interpreter/cancerTiering", null, "run", data, params); - } - - /** Run exomiser interpretation analysis - * @param {Object} data - Exomizer interpretation analysis params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runInterpreterExomiser(data, params) { - return this._post("analysis", null, "clinical/interpreter/exomiser", null, "run", data, params); - } - - /** Run TEAM interpretation analysis - * @param {Object} data - TEAM interpretation analysis params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runInterpreterTeam(data, params) { - return this._post("analysis", null, "clinical/interpreter/team", null, "run", data, params); - } - - /** Run tiering interpretation analysis - * @param {Object} data - Tiering interpretation analysis params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runInterpreterTiering(data, params) { - return this._post("analysis", null, "clinical/interpreter/tiering", null, "run", data, params); - } - - /** Run Zetta interpretation analysis - * @param {Object} data - Zetta interpretation analysis params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runInterpreterZetta(data, params) { - return this._post("analysis", null, "clinical/interpreter/zetta", null, "run", data, params); - } - - /** RGA aggregation stats - * @param {String} field - List of fields separated by semicolons, e.g.: clinicalSignificances;type. For nested fields use >>, e.g.: - * type>>clinicalSignificances;knockoutType. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - aggregationStatsRga(field, params) { - return this._get("analysis", null, "clinical/rga", null, "aggregationStats", {field, ...params}); - } - - /** Query gene RGA - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.includeIndividual] - Include only the comma separated list of individuals to the response. - * @param {Number} [params.skipIndividual] - Number of individuals to skip. - * @param {Number} [params.limitIndividual] - Limit number of individuals returned (default: 1000). - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - queryRgaGene(params) { - return this._get("analysis", null, "clinical/rga/gene", null, "query", params); - } - - /** RGA gene summary stats - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - summaryRgaGene(params) { - return this._get("analysis", null, "clinical/rga/gene", null, "summary", params); - } - - /** Generate Recessive Gene Analysis secondary index - * @param {Object} data - Recessive Gene Analysis index params. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.jobId] - Job ID. It must be a unique string within the study. An ID will be autogenerated automatically if not - * provided. - * @param {String} [params.jobDescription] - Job description. - * @param {String} [params.jobDependsOn] - Comma separated list of existing job IDs the job will depend on. - * @param {String} [params.jobTags] - Job tags. - * @param {Boolean} [params.auxiliarIndex = "false"] - Index auxiliar collection to improve performance assuming RGA is completely - * indexed. The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - runRgaIndex(data, params) { - return this._post("analysis", null, "clinical/rga/index", null, "run", data, params); - } - - /** Query individual RGA - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - queryRgaIndividual(params) { - return this._get("analysis", null, "clinical/rga/individual", null, "query", params); - } - - /** RGA individual summary stats - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - summaryRgaIndividual(params) { - return this._get("analysis", null, "clinical/rga/individual", null, "summary", params); - } - - /** Query variant RGA - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.includeIndividual] - Include only the comma separated list of individuals to the response. - * @param {Number} [params.skipIndividual] - Number of individuals to skip. - * @param {Number} [params.limitIndividual] - Limit number of individuals returned (default: 1000). - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - queryRgaVariant(params) { - return this._get("analysis", null, "clinical/rga/variant", null, "query", params); - } - - /** RGA variant summary stats - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {String} [params.sampleId] - Filter by sample id. - * @param {String} [params.individualId] - Filter by individual id. - * @param {String} [params.sex] - Filter by sex. - * @param {String} [params.phenotypes] - Filter by phenotypes. - * @param {String} [params.disorders] - Filter by disorders. - * @param {String} [params.numParents] - Filter by the number of parents registered. - * @param {String} [params.geneId] - Filter by gene id. - * @param {String} [params.geneName] - Filter by gene name. - * @param {String} [params.chromosome] - Filter by chromosome. - * @param {String} [params.start] - Filter by start position. - * @param {String} [params.end] - Filter by end position. - * @param {String} [params.transcriptId] - Filter by transcript id. - * @param {String} [params.variants] - Filter by variant id. - * @param {String} [params.dbSnps] - Filter by DB_SNP id. - * @param {String} [params.knockoutType] - Filter by knockout type. - * @param {String} [params.filter] - Filter by filter (PASS, NOT_PASS). - * @param {String} [params.type] - Filter by variant type. - * @param {String} [params.clinicalSignificance] - Filter by clinical significance. - * @param {String} [params.populationFrequency] - Filter by population frequency. - * @param {String} [params.consequenceType] - Filter by consequence type. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - summaryRgaVariant(params) { - return this._get("analysis", null, "clinical/rga/variant", null, "summary", params); - } - - /** Clinical analysis search. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count = "false"] - Get the total number of results matching the query. Deactivated by default. The default - * value is false. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.id] - Comma separated list of Clinical Analysis IDs up to a maximum of 100. - * @param {String} [params.uuid] - Comma separated list of Clinical Analysis UUIDs up to a maximum of 100. - * @param {String} [params.type] - Clinical Analysis type. - * @param {String} [params.disorder] - Clinical Analysis disorder. - * @param {String} [params.files] - Clinical Analysis files. - * @param {String} [params.sample] - Sample associated to the proband or any member of a family. - * @param {String} [params.individual] - Proband or any member of a family. - * @param {String} [params.proband] - Clinical Analysis proband. - * @param {String} [params.probandSamples] - Clinical Analysis proband samples. - * @param {String} [params.family] - Clinical Analysis family. - * @param {String} [params.familyMembers] - Clinical Analysis family members. - * @param {String} [params.familyMemberSamples] - Clinical Analysis family members samples. - * @param {String} [params.panels] - Clinical Analysis panels. - * @param {Boolean} [params.locked] - Locked Clinical Analyses. - * @param {String} [params.analystId] - Clinical Analysis analyst id. - * @param {String} [params.priority] - Clinical Analysis priority. - * @param {String} [params.flags] - Clinical Analysis flags. - * @param {String} [params.creationDate] - Clinical Analysis Creation date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.modificationDate] - Clinical Analysis Modification date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, - * <201805. - * @param {String} [params.dueDate] - Clinical Analysis due date. Format: yyyyMMddHHmmss. Examples: >2018, 2017-2018, <201805. - * @param {String} [params.qualityControlSummary] - Clinical Analysis quality control summary. - * @param {String} [params.release] - Release when it was created. - * @param {String} [params.status] - Filter by status. - * @param {String} [params.internalStatus] - Filter by internal status. - * @param {Boolean} [params.deleted] - Boolean to retrieve deleted entries. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - search(params) { - return this._get("analysis", null, "clinical", null, "search", params); - } - - /** Fetch actionable clinical variants - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.sample] - Sample ID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - actionableVariant(params) { - return this._get("analysis", null, "clinical/variant", null, "actionable", params); - } - - /** Fetch clinical variants - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {Number} [params.limit] - Number of results to be returned. - * @param {Number} [params.skip] - Number of results to skip. - * @param {Boolean} [params.count] - Get the total number of results matching the query. Deactivated by default. - * @param {Boolean} [params.approximateCount] - Get an approximate count, instead of an exact total count. Reduces execution time. - * @param {Number} [params.approximateCountSamplingSize] - Sampling size to get the approximate count. Larger values increase accuracy - * but also increase execution time. - * @param {String} [params.savedFilter] - Use a saved filter at User level. - * @param {String} [params.id] - List of IDs, these can be rs IDs (dbSNP) or variants in the format chrom:start:ref:alt, e.g. - * rs116600158,19:7177679:C:T. - * @param {String} [params.region] - List of regions, these can be just a single chromosome name or regions in the format chr:start-end, - * e.g.: 2,3:100000-200000. - * @param {String} [params.type] - List of types, accepted values are SNV, MNV, INDEL, SV, COPY_NUMBER, COPY_NUMBER_LOSS, - * COPY_NUMBER_GAIN, INSERTION, DELETION, DUPLICATION, TANDEM_DUPLICATION, BREAKEND, e.g. SNV,INDEL. - * @param {String} [params.study] - Filter variants from the given studies, these can be either the numeric ID or the alias with the - * format user@project:study. - * @param {String} [params.file] - Filter variants from the files specified. This will set includeFile parameter when not provided. - * @param {String} [params.filter] - Specify the FILTER for any of the files. If 'file' filter is provided, will match the file and the - * filter. e.g.: PASS,LowGQX. - * @param {String} [params.qual] - Specify the QUAL for any of the files. If 'file' filter is provided, will match the file and the qual. - * e.g.: >123.4. - * @param {String} [params.fileData] - Filter by file data (i.e. FILTER, QUAL and INFO columns from VCF file). - * [{file}:]{key}{op}{value}[,;]* . If no file is specified, will use all files from "file" filter. e.g. AN>200 or - * file_1.vcf:AN>200;file_2.vcf:AN<10 . Many fields can be combined. e.g. file_1.vcf:AN>200;DB=true;file_2.vcf:AN<10,FILTER=PASS,LowDP. - * @param {String} [params.sample] - Filter variants by sample genotype. This will automatically set 'includeSample' parameter when not - * provided. This filter accepts multiple 3 forms: 1) List of samples: Samples that contain the main variant. Accepts AND (;) and OR (,) - * operators. e.g. HG0097,HG0098 . 2) List of samples with genotypes: {sample}:{gt1},{gt2}. Accepts AND (;) and OR (,) operators. e.g. - * HG0097:0/0;HG0098:0/1,1/1 . Unphased genotypes (e.g. 0/1, 1/1) will also include phased genotypes (e.g. 0|1, 1|0, 1|1), but not vice - * versa. When filtering by multi-allelic genotypes, any secondary allele will match, regardless of its position e.g. 1/2 will match with - * genotypes 1/2, 1/3, 1/4, .... Genotype aliases accepted: HOM_REF, HOM_ALT, HET, HET_REF, HET_ALT, HET_MISS and MISS e.g. - * HG0097:HOM_REF;HG0098:HET_REF,HOM_ALT . 3) Sample with segregation mode: {sample}:{segregation}. Only one sample accepted.Accepted - * segregation modes: [ autosomalDominant, autosomalRecessive, XLinkedDominant, XLinkedRecessive, YLinked, mitochondrial, deNovo, - * mendelianError, compoundHeterozygous ]. Value is case insensitive. e.g. HG0097:DeNovo Sample must have parents defined and indexed. . - * @param {String} [params.sampleData] - Filter by any SampleData field from samples. [{sample}:]{key}{op}{value}[,;]* . If no sample is - * specified, will use all samples from "sample" or "genotype" filter. e.g. DP>200 or HG0097:DP>200,HG0098:DP<10 . Many FORMAT fields can - * be combined. e.g. HG0097:DP>200;GT=1/1,0/1,HG0098:DP<10. - * @param {String} [params.sampleAnnotation] - Selects some samples using metadata information from Catalog. e.g. - * age>20;phenotype=hpo:123,hpo:456;name=smith. - * @param {String} [params.cohort] - Select variants with calculated stats for the selected cohorts. - * @param {String} [params.cohortStatsRef] - Reference Allele Frequency: [{study:}]{cohort}[<|>|<=|>=]{number}. e.g. ALL<=0.4. - * @param {String} [params.cohortStatsAlt] - Alternate Allele Frequency: [{study:}]{cohort}[<|>|<=|>=]{number}. e.g. ALL<=0.4. - * @param {String} [params.cohortStatsMaf] - Minor Allele Frequency: [{study:}]{cohort}[<|>|<=|>=]{number}. e.g. ALL<=0.4. - * @param {String} [params.cohortStatsMgf] - Minor Genotype Frequency: [{study:}]{cohort}[<|>|<=|>=]{number}. e.g. ALL<=0.4. - * @param {String} [params.cohortStatsPass] - Filter PASS frequency: [{study:}]{cohort}[<|>|<=|>=]{number}. e.g. ALL>0.8. - * @param {String} [params.missingAlleles] - Number of missing alleles: [{study:}]{cohort}[<|>|<=|>=]{number}. - * @param {String} [params.missingGenotypes] - Number of missing genotypes: [{study:}]{cohort}[<|>|<=|>=]{number}. - * @param {String} [params.score] - Filter by variant score: [{study:}]{score}[<|>|<=|>=]{number}. - * @param {String} [params.family] - Filter variants where any of the samples from the given family contains the variant (HET or - * HOM_ALT). - * @param {String} [params.familyDisorder] - Specify the disorder to use for the family segregation. - * @param {String} [params.familySegregation] - Filter by segregation mode from a given family. Accepted values: [ autosomalDominant, - * autosomalRecessive, XLinkedDominant, XLinkedRecessive, YLinked, mitochondrial, deNovo, mendelianError, compoundHeterozygous ]. - * @param {String} [params.familyMembers] - Sub set of the members of a given family. - * @param {String} [params.familyProband] - Specify the proband child to use for the family segregation. - * @param {String} [params.gene] - List of genes, most gene IDs are accepted (HGNC, Ensembl gene, ...). This is an alias to 'xref' - * parameter. - * @param {String} [params.ct] - List of SO consequence types, e.g. missense_variant,stop_lost or SO:0001583,SO:0001578. Accepts aliases - * 'loss_of_function' and 'protein_altering'. - * @param {String} [params.xref] - List of any external reference, these can be genes, proteins or variants. Accepted IDs include HGNC, - * Ensembl genes, dbSNP, ClinVar, HPO, Cosmic, ... - * @param {String} [params.biotype] - List of biotypes, e.g. protein_coding. - * @param {String} [params.proteinSubstitution] - Protein substitution scores include SIFT and PolyPhen. You can query using the score - * {protein_score}[<|>|<=|>=]{number} or the description {protein_score}[~=|=]{description} e.g. polyphen>0.1,sift=tolerant. - * @param {String} [params.conservation] - Filter by conservation score: {conservation_score}[<|>|<=|>=]{number} e.g. - * phastCons>0.5,phylop<0.1,gerp>0.1. - * @param {String} [params.populationFrequencyAlt] - Alternate Population Frequency: {study}:{population}[<|>|<=|>=]{number}. e.g. - * 1000G:ALL<0.01. - * @param {String} [params.populationFrequencyRef] - Reference Population Frequency: {study}:{population}[<|>|<=|>=]{number}. e.g. - * 1000G:ALL<0.01. - * @param {String} [params.populationFrequencyMaf] - Population minor allele frequency: {study}:{population}[<|>|<=|>=]{number}. e.g. - * 1000G:ALL<0.01. - * @param {String} [params.transcriptFlag] - List of transcript flags. e.g. canonical, CCDS, basic, LRG, MANE Select, MANE Plus Clinical, - * EGLH_HaemOnc, TSO500. - * @param {String} [params.geneTraitId] - List of gene trait association id. e.g. "umls:C0007222" , "OMIM:269600". - * @param {String} [params.go] - List of GO (Gene Ontology) terms. e.g. "GO:0002020". - * @param {String} [params.expression] - List of tissues of interest. e.g. "lung". - * @param {String} [params.proteinKeyword] - List of Uniprot protein variant annotation keywords. - * @param {String} [params.drug] - List of drug names. - * @param {String} [params.functionalScore] - Functional score: {functional_score}[<|>|<=|>=]{number} e.g. cadd_scaled>5.2 , - * cadd_raw<=0.3. - * @param {String} [params.clinical] - Clinical source: clinvar, cosmic. - * @param {String} [params.clinicalSignificance] - Clinical significance: benign, likely_benign, likely_pathogenic, pathogenic. - * @param {Boolean} [params.clinicalConfirmedStatus] - Clinical confirmed status. - * @param {String} [params.customAnnotation] - Custom annotation: {key}[<|>|<=|>=]{number} or {key}[~=|=]{text}. - * @param {String} [params.panel] - Filter by genes from the given disease panel. - * @param {String} [params.panelModeOfInheritance] - Filter genes from specific panels that match certain mode of inheritance. Accepted - * values : [ autosomalDominant, autosomalRecessive, XLinkedDominant, XLinkedRecessive, YLinked, mitochondrial, deNovo, mendelianError, - * compoundHeterozygous ]. - * @param {String} [params.panelConfidence] - Filter genes from specific panels that match certain confidence. Accepted values : [ high, - * medium, low, rejected ]. - * @param {String} [params.panelRoleInCancer] - Filter genes from specific panels that match certain role in cancer. Accepted values : [ - * both, oncogene, tumorSuppressorGene, fusion ]. - * @param {String} [params.panelFeatureType] - Filter elements from specific panels by type. Accepted values : [ gene, region, str, - * variant ]. - * @param {Boolean} [params.panelIntersection] - Intersect panel genes and regions with given genes and regions from que input query. - * This will prevent returning variants from regions out of the panel. - * @param {String} [params.trait] - List of traits, based on ClinVar, HPO, COSMIC, i.e.: IDs, histologies, descriptions,... - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - queryVariant(params) { - return this._get("analysis", null, "clinical/variant", null, "query", params); - } - - /** Returns the acl of the clinical analyses. If member is provided, it will only return the acl for the member. - * @param {String} clinicalAnalyses - Comma separated list of clinical analysis IDs or names up to a maximum of 100. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {String} [params.member] - User or group ID. - * @param {Boolean} [params.silent = "false"] - Boolean to retrieve all possible entries that are queried for, false to raise an - * exception whenever one of the entries looked for cannot be shown for whichever reason. The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - acl(clinicalAnalyses, params) { - return this._get("analysis", null, "clinical", clinicalAnalyses, "acl", params); - } - - /** Delete clinical analyses - * @param {String} clinicalAnalyses - Comma separated list of clinical analysis IDs or names up to a maximum of 100. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {Boolean} [params.force = "false"] - Force deletion if the ClinicalAnalysis contains interpretations or is locked. The default - * value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - delete(clinicalAnalyses, params) { - return this._delete("analysis", null, "clinical", clinicalAnalyses, "delete", params); - } - - /** Update clinical analysis attributes - * @param {String} clinicalAnalyses - Comma separated list of clinical analysis IDs. - * @param {Object} data - JSON containing clinical analysis information. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {"ADD"|"REMOVE"|"REPLACE"} [params.commentsAction = "ADD"] - Action to be performed if the array of comments is being updated. - * The default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"} [params.flagsAction = "ADD"] - Action to be performed if the array of flags is being updated. The - * default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"} [params.filesAction = "ADD"] - Action to be performed if the array of files is being updated. The - * default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"} [params.panelsAction = "ADD"] - Action to be performed if the array of panels is being updated. The - * default value is ADD. - * @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response. - * The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - update(clinicalAnalyses, data, params) { - return this._post("analysis", null, "clinical", clinicalAnalyses, "update", data, params); - } - - /** Clinical analysis info - * @param {String} clinicalAnalysis - Comma separated list of clinical analysis IDs or names up to a maximum of 100. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. - * @param {Boolean} [params.deleted = "false"] - Boolean to retrieve deleted entries. The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - info(clinicalAnalysis, params) { - return this._get("analysis", null, "clinical", clinicalAnalysis, "info", params); - } - - /** Create a new Interpretation - * @param {String} clinicalAnalysis - Clinical analysis ID. - * @param {Object} data - JSON containing clinical interpretation information. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - [[user@]project:]study id. - * @param {"PRIMARY"|"SECONDARY"} [params.setAs = "SECONDARY"] - Set interpretation as. The default value is SECONDARY. - * @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response. - * The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - createInterpretation(clinicalAnalysis, data, params) { - return this._post("analysis/clinical", clinicalAnalysis, "interpretation", null, "create", data, params); - } - - /** Clear the fields of the main interpretation of the Clinical Analysis - * @param {String} interpretations - Interpretation IDs of the Clinical Analysis. - * @param {String} clinicalAnalysis - Clinical analysis ID. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - [[user@]project:]study ID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - clearInterpretation(clinicalAnalysis, interpretations, params) { - return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretations, "clear", params); - } - - /** Delete interpretation - * @param {String} clinicalAnalysis - Clinical analysis ID. - * @param {String} interpretations - Interpretation IDs of the Clinical Analysis. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - [[user@]project:]study ID. - * @param {String} [params.setAsPrimary] - Interpretation id to set as primary from the list of secondaries in case of deleting the - * actual primary one. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - deleteInterpretation(clinicalAnalysis, interpretations, params) { - return this._delete("analysis/clinical", clinicalAnalysis, "interpretation", interpretations, "delete", params); - } - - /** Revert to a previous interpretation version - * @param {String} clinicalAnalysis - Clinical analysis ID. - * @param {String} interpretation - Interpretation ID. - * @param {Number} version - Version to revert to. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.study] - [[user@]project:]study ID. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - revertInterpretation(clinicalAnalysis, interpretation, version, params) { - return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "revert", {version, ...params}); - } - - /** Update interpretation fields - * @param {String} clinicalAnalysis - Clinical analysis ID. - * @param {String} interpretation - Interpretation ID. - * @param {Object} data - JSON containing clinical interpretation information. - * @param {Object} [params] - The Object containing the following optional parameters: - * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. - * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - [[user@]project:]study ID. - * @param {"ADD"|"SET"|"REMOVE"|"REPLACE"} [params.primaryFindingsAction = "ADD"] - Action to be performed if the array of primary - * findings is being updated. The default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"} [params.methodsAction = "ADD"] - Action to be performed if the array of methods is being updated. The - * default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"|"REPLACE"} [params.secondaryFindingsAction = "ADD"] - Action to be performed if the array of secondary - * findings is being updated. The default value is ADD. - * @param {"ADD"|"REMOVE"|"REPLACE"} [params.commentsAction = "ADD"] - Action to be performed if the array of comments is being updated. - * To REMOVE or REPLACE, the date will need to be provided to identify the comment. The default value is ADD. - * @param {"ADD"|"SET"|"REMOVE"} [params.panelsAction = "ADD"] - Action to be performed if the array of panels is being updated. The - * default value is ADD. - * @param {"PRIMARY"|"SECONDARY"} [params.setAs] - Set interpretation as. - * @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response. - * The default value is false. - * @returns {Promise} Promise object in the form of RestResponse instance. - */ - updateInterpretation(clinicalAnalysis, interpretation, data, params) { - return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "update", data, params); - } - -} \ No newline at end of file diff --git a/opencga-client/src/main/javascript/ClinicalAnalysis.js b/opencga-client/src/main/javascript/ClinicalAnalysis.js index 3430f69661a..826196fd984 100644 --- a/opencga-client/src/main/javascript/ClinicalAnalysis.js +++ b/opencga-client/src/main/javascript/ClinicalAnalysis.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Cohort.js b/opencga-client/src/main/javascript/Cohort.js index badd624d5ae..f11d56a865f 100644 --- a/opencga-client/src/main/javascript/Cohort.js +++ b/opencga-client/src/main/javascript/Cohort.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/DiseasePanel.js b/opencga-client/src/main/javascript/DiseasePanel.js index 628b7c44bf2..aa4346dce4b 100644 --- a/opencga-client/src/main/javascript/DiseasePanel.js +++ b/opencga-client/src/main/javascript/DiseasePanel.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Family.js b/opencga-client/src/main/javascript/Family.js index 5488744f8cd..51ceba74de6 100644 --- a/opencga-client/src/main/javascript/Family.js +++ b/opencga-client/src/main/javascript/Family.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/File.js b/opencga-client/src/main/javascript/File.js index 54ab6b38608..7793fe89976 100644 --- a/opencga-client/src/main/javascript/File.js +++ b/opencga-client/src/main/javascript/File.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/GA4GH.js b/opencga-client/src/main/javascript/GA4GH.js index fcce4ffa025..a875626c28c 100644 --- a/opencga-client/src/main/javascript/GA4GH.js +++ b/opencga-client/src/main/javascript/GA4GH.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Individual.js b/opencga-client/src/main/javascript/Individual.js index 6b8f1ecd931..19ab182bff7 100644 --- a/opencga-client/src/main/javascript/Individual.js +++ b/opencga-client/src/main/javascript/Individual.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Job.js b/opencga-client/src/main/javascript/Job.js index c92fb36da73..2ddbc5e5cd8 100644 --- a/opencga-client/src/main/javascript/Job.js +++ b/opencga-client/src/main/javascript/Job.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Meta.js b/opencga-client/src/main/javascript/Meta.js index 1fae236ef72..35a8a7bea37 100644 --- a/opencga-client/src/main/javascript/Meta.js +++ b/opencga-client/src/main/javascript/Meta.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -58,11 +58,12 @@ export default class Meta extends OpenCGAParentClass { } /** Opencga model webservices. - * + * @param {Object} [params] - The Object containing the following optional parameters: + * @param {String} [params.model] - Model description. * @returns {Promise} Promise object in the form of RestResponse instance. */ - model() { - return this._get("meta", null, null, null, "model"); + model(params) { + return this._get("meta", null, null, null, "model", params); } /** Ping Opencga webservices. diff --git a/opencga-client/src/main/javascript/Project.js b/opencga-client/src/main/javascript/Project.js index a1a491cfc74..d11f75b8d23 100644 --- a/opencga-client/src/main/javascript/Project.js +++ b/opencga-client/src/main/javascript/Project.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Sample.js b/opencga-client/src/main/javascript/Sample.js index f0e3976fcfd..cde2fc56988 100644 --- a/opencga-client/src/main/javascript/Sample.js +++ b/opencga-client/src/main/javascript/Sample.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Study.js b/opencga-client/src/main/javascript/Study.js index 183cf9ac13a..89bb9f11141 100644 --- a/opencga-client/src/main/javascript/Study.js +++ b/opencga-client/src/main/javascript/Study.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/User.js b/opencga-client/src/main/javascript/User.js index 533db2eada8..c7d367f9d91 100644 --- a/opencga-client/src/main/javascript/User.js +++ b/opencga-client/src/main/javascript/User.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Variant.js b/opencga-client/src/main/javascript/Variant.js index 9bf3047933e..8f80259b632 100644 --- a/opencga-client/src/main/javascript/Variant.js +++ b/opencga-client/src/main/javascript/Variant.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/VariantOperation.js b/opencga-client/src/main/javascript/VariantOperation.js index a64b11f4c83..e58c1c5a845 100644 --- a/opencga-client/src/main/javascript/VariantOperation.js +++ b/opencga-client/src/main/javascript/VariantOperation.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-01-30 + * Autogenerated on: 2024-02-02 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py index 343834c5ef7..1e5a18df72c 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py index c400a3b2fd1..8068df5192c 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py index f53c3ec76af..3c8df26fc32 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py index 677706b1e58..0adc73e3160 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py index a8ae201e7ef..2252a5bda1e 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py index cc9fa767f0f..f117855649f 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py index c72e0ffd925..fa9b8715b93 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py index 86d7747f04b..11f564a6d50 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py index db1015702ce..ae2bae8302c 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py index 838451d7ea4..82bf6816596 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py index a105a0c620b..17c4fc4a001 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -51,6 +51,8 @@ def model(self, **options): """ Opencga model webservices. PATH: /{apiVersion}/meta/model + + :param str model: Model description. """ return self._get(category='meta', resource='model', **options) diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py index 610283c05e9..412a3fd08ea 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py index 6cece56e1a9..1c4234aaa24 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py index 594beda62f7..369500ff951 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py index cc09130e3a1..60ff5ae333a 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py index 1709580dcc7..37608000460 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py index 56a41020056..21c0eec6ec8 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-01-30 + Autogenerated on: 2024-02-02 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-server/src/main/java/org/opencb/opencga/server/rest/MetaWSServer.java b/opencga-server/src/main/java/org/opencb/opencga/server/rest/MetaWSServer.java index edb1ab223c1..c416d0474b8 100644 --- a/opencga-server/src/main/java/org/opencb/opencga/server/rest/MetaWSServer.java +++ b/opencga-server/src/main/java/org/opencb/opencga/server/rest/MetaWSServer.java @@ -110,7 +110,7 @@ public Response status() { @GET @Path("/model") @ApiOperation(value = "Opencga model webservices.", response = String.class) - public Response model(@QueryParam("model") String modelStr) { + public Response model(@ApiParam(value = "Model description") @QueryParam("model") String modelStr) { return run(() -> new OpenCGAResult<>(0, Collections.emptyList(), 1, Collections.singletonList(DataModelsUtils.dataModelToJsonString(modelStr, false)), 1)); From be0798fc8ba08a7e8c08e45b85e3f08cdebebca0 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 6 Feb 2024 13:51:11 +0100 Subject: [PATCH 12/16] Prepare release 2.12.2 --- opencga-analysis/pom.xml | 2 +- opencga-app/pom.xml | 2 +- opencga-catalog/pom.xml | 2 +- opencga-client/pom.xml | 2 +- opencga-clinical/pom.xml | 2 +- opencga-core/pom.xml | 2 +- opencga-master/pom.xml | 2 +- opencga-server/pom.xml | 2 +- opencga-storage/opencga-storage-app/pom.xml | 2 +- opencga-storage/opencga-storage-benchmark/pom.xml | 2 +- opencga-storage/opencga-storage-core/pom.xml | 2 +- .../opencga-storage-hadoop-core/pom.xml | 2 +- .../opencga-storage-hadoop-deps-emr6.1/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp2.6/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp3.1/pom.xml | 2 +- .../opencga-storage-hadoop-deps/pom.xml | 2 +- opencga-storage/opencga-storage-hadoop/pom.xml | 2 +- opencga-storage/opencga-storage-server/pom.xml | 2 +- opencga-storage/pom.xml | 2 +- opencga-test/pom.xml | 2 +- pom.xml | 14 +++++++------- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/opencga-analysis/pom.xml b/opencga-analysis/pom.xml index 265e72c158e..820f1b2b2de 100644 --- a/opencga-analysis/pom.xml +++ b/opencga-analysis/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml index 90d4339f302..534b11ee520 100644 --- a/opencga-app/pom.xml +++ b/opencga-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-catalog/pom.xml b/opencga-catalog/pom.xml index b6c3104bb44..786b6d823a2 100644 --- a/opencga-catalog/pom.xml +++ b/opencga-catalog/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-client/pom.xml b/opencga-client/pom.xml index db92bb3fe27..3941e12a874 100644 --- a/opencga-client/pom.xml +++ b/opencga-client/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-clinical/pom.xml b/opencga-clinical/pom.xml index 693f452614d..3dae041334b 100644 --- a/opencga-clinical/pom.xml +++ b/opencga-clinical/pom.xml @@ -5,7 +5,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml 4.0.0 diff --git a/opencga-core/pom.xml b/opencga-core/pom.xml index 1282dec662d..43b0430d220 100644 --- a/opencga-core/pom.xml +++ b/opencga-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-master/pom.xml b/opencga-master/pom.xml index 6df937c20f9..229329ed5aa 100644 --- a/opencga-master/pom.xml +++ b/opencga-master/pom.xml @@ -22,7 +22,7 @@ opencga org.opencb.opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml index a462ea52963..433de25bea4 100644 --- a/opencga-server/pom.xml +++ b/opencga-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-app/pom.xml b/opencga-storage/opencga-storage-app/pom.xml index 2b3005ce736..fa6b17f8ca9 100644 --- a/opencga-storage/opencga-storage-app/pom.xml +++ b/opencga-storage/opencga-storage-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-benchmark/pom.xml b/opencga-storage/opencga-storage-benchmark/pom.xml index 0b7b09f0e50..d97d69874e4 100644 --- a/opencga-storage/opencga-storage-benchmark/pom.xml +++ b/opencga-storage/opencga-storage-benchmark/pom.xml @@ -22,7 +22,7 @@ opencga-storage org.opencb.opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-core/pom.xml b/opencga-storage/opencga-storage-core/pom.xml index 407a2fe5afa..7ac862be877 100644 --- a/opencga-storage/opencga-storage-core/pom.xml +++ b/opencga-storage/opencga-storage-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml index ea8a4f03775..751872456fe 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml index f7afa167980..c081a623352 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml index a584723d321..53d7727be0a 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml index 9e3018c3075..185ab57e501 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml index 4dc58124cbe..4fa3b8f8823 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml @@ -50,7 +50,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml index 63ebff0a728..8cc7e84c668 100644 --- a/opencga-storage/opencga-storage-hadoop/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/pom.xml @@ -28,7 +28,7 @@ org.opencb.opencga opencga-storage - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/opencga-storage-server/pom.xml b/opencga-storage/opencga-storage-server/pom.xml index 8405b936d23..ffbe5a2fd91 100644 --- a/opencga-storage/opencga-storage-server/pom.xml +++ b/opencga-storage/opencga-storage-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-storage/pom.xml b/opencga-storage/pom.xml index 32a43076828..690c8e06bdb 100644 --- a/opencga-storage/pom.xml +++ b/opencga-storage/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml index 2235e4a9ce8..9ae266a20bc 100644 --- a/opencga-test/pom.xml +++ b/opencga-test/pom.xml @@ -24,7 +24,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 ../pom.xml diff --git a/pom.xml b/pom.xml index 1fe6e6f6530..3860a3d7ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2-SNAPSHOT + 2.12.2 pom OpenCGA @@ -43,12 +43,12 @@ - 2.12.2_dev - 2.12.2_dev - 5.8.2-SNAPSHOT - 2.12.2-SNAPSHOT - 4.12.1-SNAPSHOT - 2.12.2-SNAPSHOT + 2.12.2 + 2.12.2 + 5.8.2 + 2.12.1 + 4.12.0 + 2.12.2 0.2.0 2.11.4 From 311a97f038f6e28302fc68ec1c975f4a866b1fff Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 5 Mar 2024 18:10:59 +0100 Subject: [PATCH 13/16] Prepare portpatch #TASK-5618 --- opencga-analysis/pom.xml | 2 +- opencga-app/pom.xml | 2 +- opencga-catalog/pom.xml | 2 +- opencga-client/pom.xml | 2 +- opencga-clinical/pom.xml | 2 +- opencga-core/pom.xml | 2 +- opencga-master/pom.xml | 2 +- opencga-server/pom.xml | 2 +- opencga-storage/opencga-storage-app/pom.xml | 2 +- opencga-storage/opencga-storage-benchmark/pom.xml | 2 +- opencga-storage/opencga-storage-core/pom.xml | 2 +- .../opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml | 2 +- .../opencga-storage-hadoop-deps-emr6.1/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp2.6/pom.xml | 2 +- .../opencga-storage-hadoop-deps-hdp3.1/pom.xml | 2 +- .../opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml | 2 +- opencga-storage/opencga-storage-hadoop/pom.xml | 2 +- opencga-storage/opencga-storage-server/pom.xml | 2 +- opencga-storage/pom.xml | 2 +- opencga-test/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/opencga-analysis/pom.xml b/opencga-analysis/pom.xml index 820f1b2b2de..35da9a4f99b 100644 --- a/opencga-analysis/pom.xml +++ b/opencga-analysis/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml index 534b11ee520..ffdc451a766 100644 --- a/opencga-app/pom.xml +++ b/opencga-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-catalog/pom.xml b/opencga-catalog/pom.xml index 786b6d823a2..633389bd8dd 100644 --- a/opencga-catalog/pom.xml +++ b/opencga-catalog/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-client/pom.xml b/opencga-client/pom.xml index 3941e12a874..e8e9c753dd4 100644 --- a/opencga-client/pom.xml +++ b/opencga-client/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-clinical/pom.xml b/opencga-clinical/pom.xml index 3dae041334b..80cf5324837 100644 --- a/opencga-clinical/pom.xml +++ b/opencga-clinical/pom.xml @@ -5,7 +5,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/opencga-core/pom.xml b/opencga-core/pom.xml index 43b0430d220..dd8e2ad01d4 100644 --- a/opencga-core/pom.xml +++ b/opencga-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-master/pom.xml b/opencga-master/pom.xml index 229329ed5aa..8152c26eaf4 100644 --- a/opencga-master/pom.xml +++ b/opencga-master/pom.xml @@ -22,7 +22,7 @@ opencga org.opencb.opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml index 433de25bea4..3f1e4a682b5 100644 --- a/opencga-server/pom.xml +++ b/opencga-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-app/pom.xml b/opencga-storage/opencga-storage-app/pom.xml index fa6b17f8ca9..b20c1d8115b 100644 --- a/opencga-storage/opencga-storage-app/pom.xml +++ b/opencga-storage/opencga-storage-app/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-benchmark/pom.xml b/opencga-storage/opencga-storage-benchmark/pom.xml index d97d69874e4..35e2805dc98 100644 --- a/opencga-storage/opencga-storage-benchmark/pom.xml +++ b/opencga-storage/opencga-storage-benchmark/pom.xml @@ -22,7 +22,7 @@ opencga-storage org.opencb.opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-core/pom.xml b/opencga-storage/opencga-storage-core/pom.xml index 7ac862be877..b9deeb49386 100644 --- a/opencga-storage/opencga-storage-core/pom.xml +++ b/opencga-storage/opencga-storage-core/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml index 751872456fe..26f5e773f14 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml @@ -23,7 +23,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml index c081a623352..2ef5c79bb53 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml index 53d7727be0a..5a162302e74 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml index 185ab57e501..ee2c708c193 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage-hadoop-deps - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml index 4fa3b8f8823..9d9c1350046 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml @@ -50,7 +50,7 @@ org.opencb.opencga opencga-storage-hadoop - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml index 8cc7e84c668..cd9556e2d70 100644 --- a/opencga-storage/opencga-storage-hadoop/pom.xml +++ b/opencga-storage/opencga-storage-hadoop/pom.xml @@ -28,7 +28,7 @@ org.opencb.opencga opencga-storage - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/opencga-storage-server/pom.xml b/opencga-storage/opencga-storage-server/pom.xml index ffbe5a2fd91..c2d67f4046c 100644 --- a/opencga-storage/opencga-storage-server/pom.xml +++ b/opencga-storage/opencga-storage-server/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga-storage - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-storage/pom.xml b/opencga-storage/pom.xml index 690c8e06bdb..221a9b348c6 100644 --- a/opencga-storage/pom.xml +++ b/opencga-storage/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml index 9ae266a20bc..131840a3d34 100644 --- a/opencga-test/pom.xml +++ b/opencga-test/pom.xml @@ -24,7 +24,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 3860a3d7ed0..9be0f247109 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.opencb.opencga opencga - 2.12.2 + 3.0.0-SNAPSHOT pom OpenCGA From 730e2492698c31c7a2fb41a39292ddf5ce1576ac Mon Sep 17 00:00:00 2001 From: pfurio Date: Wed, 6 Mar 2024 11:05:30 +0100 Subject: [PATCH 14/16] catalog: fix ClinicalAnalysisManager for port patch, #TASK-5618 --- .../managers/ClinicalAnalysisManager.java | 28 +++++++++++-------- .../managers/ClinicalAnalysisManagerTest.java | 28 +++++++++---------- pom.xml | 17 ----------- 3 files changed, 31 insertions(+), 42 deletions(-) diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java index 9305e24cc74..5640aeae5ed 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManager.java @@ -1698,8 +1698,8 @@ private OpenCGAResult update(String organizationId, Study stud public OpenCGAResult updateReport(String studyStr, String clinicalAnalysisId, ClinicalReport report, QueryOptions options, String token) throws CatalogException { - String userId = userManager.getUserId(token); - Study study = studyManager.resolveId(studyStr, userId); + JwtPayload tokenPayload = catalogManager.getUserManager().validateToken(token); + CatalogFqn studyFqn = CatalogFqn.extractFqnFromStudy(studyStr, tokenPayload); String operationId = UuidUtils.generateOpenCgaUuid(UuidUtils.Entity.AUDIT); @@ -1712,10 +1712,16 @@ public OpenCGAResult updateReport(String studyStr, String clinic String caseId = clinicalAnalysisId; String caseUuid = ""; + String organizationId = studyFqn.getOrganizationId(); + String userId = tokenPayload.getUserId(organizationId); + String studyId = studyFqn.getStudyId(); + String studyUuid = studyFqn.getStudyUuid(); try { + Study study = catalogManager.getStudyManager().resolveId(studyFqn, StudyManager.INCLUDE_VARIABLE_SET, tokenPayload); options = ParamUtils.defaultObject(options, QueryOptions::new); - ClinicalAnalysis clinicalAnalysis = internalGet(study.getUid(), clinicalAnalysisId, INCLUDE_CLINICAL_IDS, userId).first(); - authorizationManager.checkClinicalAnalysisPermission(study.getUid(), clinicalAnalysis.getUid(), userId, + ClinicalAnalysis clinicalAnalysis = internalGet(organizationId, study.getUid(), clinicalAnalysisId, INCLUDE_CLINICAL_IDS, + userId).first(); + authorizationManager.checkClinicalAnalysisPermission(organizationId, study.getUid(), clinicalAnalysis.getUid(), userId, ClinicalAnalysisPermissions.WRITE); caseId = clinicalAnalysis.getId(); caseUuid = clinicalAnalysis.getUuid(); @@ -1740,11 +1746,11 @@ public OpenCGAResult updateReport(String studyStr, String clinic updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.COMMENTS.key(), report.getComments()); } if (CollectionUtils.isNotEmpty(report.getFiles())) { - List files = obtainFiles(study, userId, report.getFiles()); + List files = obtainFiles(organizationId, study, userId, report.getFiles()); updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.FILES.key(), files, false); } if (CollectionUtils.isNotEmpty(report.getSupportingEvidences())) { - List files = obtainFiles(study, userId, report.getSupportingEvidences()); + List files = obtainFiles(organizationId, study, userId, report.getSupportingEvidences()); updateMap.put(ClinicalAnalysisDBAdaptor.ReportQueryParams.SUPPORTING_EVIDENCES.key(), files, false); } ClinicalAudit clinicalAudit = new ClinicalAudit(userId, ClinicalAudit.Action.UPDATE_CLINICAL_ANALYSIS, @@ -1752,13 +1758,13 @@ public OpenCGAResult updateReport(String studyStr, String clinic // Add custom key to ensure it is properly updated updateMap = new ObjectMap(ClinicalAnalysisDBAdaptor.QueryParams.REPORT_UPDATE.key(), updateMap); - OpenCGAResult update = clinicalDBAdaptor.update(clinicalAnalysis.getUid(), updateMap, null, - Collections.singletonList(clinicalAudit), options); + OpenCGAResult update = getClinicalAnalysisDBAdaptor(organizationId) + .update(clinicalAnalysis.getUid(), updateMap, null, Collections.singletonList(clinicalAudit), options); auditManager.auditUpdate(operationId, userId, Enums.Resource.CLINICAL_ANALYSIS, caseId, caseUuid, study.getId(), study.getUuid(), auditParams, new AuditRecord.Status(AuditRecord.Status.Result.SUCCESS)); if (options.getBoolean(ParamConstants.INCLUDE_RESULT_PARAM)) { // Fetch updated clinical analysis - OpenCGAResult result = clinicalDBAdaptor.get(study.getUid(), + OpenCGAResult result = getClinicalAnalysisDBAdaptor(organizationId).get(study.getUid(), new Query(ClinicalAnalysisDBAdaptor.QueryParams.UID.key(), clinicalAnalysis.getUid()), options, userId); update.setResults(result.getResults()); } @@ -1772,8 +1778,8 @@ public OpenCGAResult updateReport(String studyStr, String clinic update.getNumMatches(), update.getNumInserted(), update.getNumUpdated(), update.getNumDeleted(), update.getNumErrors(), update.getAttributes(), update.getFederationNode()); } catch (CatalogException e) { - auditManager.auditUpdate(operationId, userId, Enums.Resource.CLINICAL_ANALYSIS, caseId, caseUuid, study.getId(), - study.getUuid(), auditParams, new AuditRecord.Status(AuditRecord.Status.Result.ERROR, e.getError())); + auditManager.auditUpdate(operationId, userId, Enums.Resource.CLINICAL_ANALYSIS, caseId, caseUuid, studyId, studyUuid, + auditParams, new AuditRecord.Status(AuditRecord.Status.Result.ERROR, e.getError())); throw e; } } diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java index ad1c4cc2f65..cf267f04b71 100644 --- a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java +++ b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/ClinicalAnalysisManagerTest.java @@ -452,24 +452,24 @@ public void updateClinicalAnalysisReportWithActions() throws CatalogException { assertNull(case1.getReport()); // Add files - catalogManager.getFileManager().create(STUDY, + catalogManager.getFileManager().create(studyFqn, new FileCreateParams() .setContent(RandomStringUtils.randomAlphanumeric(1000)) .setPath("/data/file1.txt") .setType(File.Type.FILE), - true, sessionIdUser); - catalogManager.getFileManager().create(STUDY, + true, ownerToken); + catalogManager.getFileManager().create(studyFqn, new FileCreateParams() .setContent(RandomStringUtils.randomAlphanumeric(1000)) .setPath("/data/file2.txt") .setType(File.Type.FILE), - true, sessionIdUser); - catalogManager.getFileManager().create(STUDY, + true, ownerToken); + catalogManager.getFileManager().create(studyFqn, new FileCreateParams() .setContent(RandomStringUtils.randomAlphanumeric(1000)) .setPath("/data/file3.txt") .setType(File.Type.FILE), - true, sessionIdUser); + true, ownerToken); ClinicalReport report = new ClinicalReport("title", "overview", new ClinicalDiscussion("me", TimeUtils.getTime(), "text"), "logo", "me", "signature", TimeUtils.getTime(), Arrays.asList( @@ -478,8 +478,8 @@ public void updateClinicalAnalysisReportWithActions() throws CatalogException { ), Collections.singletonList(new File().setId("data:file1.txt")), Collections.singletonList(new File().setId("data:file2.txt"))); - OpenCGAResult result = catalogManager.getClinicalAnalysisManager().update(STUDY, case1.getId(), - new ClinicalAnalysisUpdateParams().setReport(report), INCLUDE_RESULT, sessionIdUser); + OpenCGAResult result = catalogManager.getClinicalAnalysisManager().update(studyFqn, case1.getId(), + new ClinicalAnalysisUpdateParams().setReport(report), INCLUDE_RESULT, ownerToken); assertNotNull(result.first().getReport()); assertEquals(report.getTitle(), result.first().getReport().getTitle()); assertEquals(report.getOverview(), result.first().getReport().getOverview()); @@ -508,8 +508,8 @@ public void updateClinicalAnalysisReportWithActions() throws CatalogException { new File().setId("data:file3.txt") )) .setSupportingEvidences(Collections.singletonList(new File().setId("data:file1.txt"))); - ClinicalReport reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, - options, sessionIdUser).first(); + ClinicalReport reportResult = catalogManager.getClinicalAnalysisManager().updateReport(studyFqn, case1.getId(), reportToUpdate, + options, ownerToken).first(); // Check comments assertEquals(3, reportResult.getComments().size()); assertEquals("comment1", reportResult.getComments().get(0).getMessage()); @@ -542,8 +542,8 @@ public void updateClinicalAnalysisReportWithActions() throws CatalogException { new File().setId("data:file3.txt") )); ClinicalComment pendingComment = reportResult.getComments().get(2); - reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, - options, sessionIdUser).first(); + reportResult = catalogManager.getClinicalAnalysisManager().updateReport(studyFqn, case1.getId(), reportToUpdate, + options, ownerToken).first(); // Check comments assertEquals(1, reportResult.getComments().size()); assertEquals(pendingComment.getMessage(), reportResult.getComments().get(0).getMessage()); @@ -574,8 +574,8 @@ public void updateClinicalAnalysisReportWithActions() throws CatalogException { .setSupportingEvidences(Collections.singletonList( new File().setId("data:file2.txt") )); - reportResult = catalogManager.getClinicalAnalysisManager().updateReport(STUDY, case1.getId(), reportToUpdate, - options, sessionIdUser).first(); + reportResult = catalogManager.getClinicalAnalysisManager().updateReport(studyFqn, case1.getId(), reportToUpdate, + options, ownerToken).first(); // Check comments assertEquals(1, reportResult.getComments().size()); assertEquals("comment3", reportResult.getComments().get(0).getMessage()); diff --git a/pom.xml b/pom.xml index b6b7c35814f..7d49e44a0c7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,21 +43,12 @@ -<<<<<<< HEAD - 2.12.2 - 2.12.2 - 5.8.2 - 2.12.1 - 4.12.0 - 2.12.2 -======= 3.0.0_dev 3.0.0_dev 6.0.0-SNAPSHOT 3.0.0-SNAPSHOT 5.0.0-SNAPSHOT 3.0.0-SNAPSHOT ->>>>>>> develop 0.2.0 2.14.3 @@ -1122,14 +1113,6 @@ slf4j-simple -<<<<<<< HEAD - - - org.glassfish.jersey.media - jersey-media-json-jackson - 2.30.1 -======= ->>>>>>> develop com.esotericsoftware.kryo From 1ed3c35a9e10dc5bf5e1d785fce9d8f08d995032 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 6 Mar 2024 12:27:07 +0100 Subject: [PATCH 15/16] Port Patch 1.10.2 -> 2.0.0 #TASK-5618 --- .../app/cli/main/OpenCgaCompleter.java | 12 +--- .../app/cli/main/OpencgaCliOptionsParser.java | 6 +- .../AnalysisClinicalCommandOptions.java | 2 +- opencga-client/src/main/R/R/Admin-methods.R | 6 +- .../src/main/R/R/Alignment-methods.R | 6 +- opencga-client/src/main/R/R/AllGenerics.R | 56 ++++--------------- .../src/main/R/R/Clinical-methods.R | 14 +---- opencga-client/src/main/R/R/Cohort-methods.R | 12 +--- opencga-client/src/main/R/R/Family-methods.R | 12 +--- opencga-client/src/main/R/R/File-methods.R | 12 +--- opencga-client/src/main/R/R/GA4GH-methods.R | 8 +-- .../src/main/R/R/Individual-methods.R | 12 +--- opencga-client/src/main/R/R/Job-methods.R | 12 +--- opencga-client/src/main/R/R/Meta-methods.R | 6 +- .../src/main/R/R/Operation-methods.R | 6 +- .../src/main/R/R/Organization-methods.R | 2 +- opencga-client/src/main/R/R/Panel-methods.R | 6 +- opencga-client/src/main/R/R/Project-methods.R | 8 +-- opencga-client/src/main/R/R/Sample-methods.R | 12 +--- opencga-client/src/main/R/R/Study-methods.R | 12 +--- opencga-client/src/main/R/R/User-methods.R | 10 +--- opencga-client/src/main/R/R/Variant-methods.R | 6 +- .../client/rest/clients/AdminClient.java | 10 +--- .../client/rest/clients/AlignmentClient.java | 10 +--- .../rest/clients/ClinicalAnalysisClient.java | 12 +--- .../client/rest/clients/CohortClient.java | 10 +--- .../rest/clients/DiseasePanelClient.java | 10 +--- .../client/rest/clients/FamilyClient.java | 10 +--- .../client/rest/clients/FileClient.java | 10 +--- .../client/rest/clients/GA4GHClient.java | 10 +--- .../client/rest/clients/IndividualClient.java | 10 +--- .../client/rest/clients/JobClient.java | 10 +--- .../client/rest/clients/MetaClient.java | 10 +--- .../rest/clients/OrganizationClient.java | 2 +- .../client/rest/clients/ProjectClient.java | 10 +--- .../client/rest/clients/SampleClient.java | 10 +--- .../client/rest/clients/StudyClient.java | 10 +--- .../client/rest/clients/UserClient.java | 10 +--- .../client/rest/clients/VariantClient.java | 10 +--- .../rest/clients/VariantOperationClient.java | 10 +--- opencga-client/src/main/javascript/Admin.js | 6 +- .../src/main/javascript/Alignment.js | 6 +- .../src/main/javascript/ClinicalAnalysis.js | 8 +-- opencga-client/src/main/javascript/Cohort.js | 6 +- .../src/main/javascript/DiseasePanel.js | 6 +- opencga-client/src/main/javascript/Family.js | 6 +- opencga-client/src/main/javascript/File.js | 6 +- opencga-client/src/main/javascript/GA4GH.js | 6 +- .../src/main/javascript/Individual.js | 6 +- opencga-client/src/main/javascript/Job.js | 6 +- opencga-client/src/main/javascript/Meta.js | 6 +- .../src/main/javascript/Organization.js | 2 +- opencga-client/src/main/javascript/Project.js | 6 +- opencga-client/src/main/javascript/Sample.js | 6 +- opencga-client/src/main/javascript/Study.js | 6 +- opencga-client/src/main/javascript/User.js | 6 +- opencga-client/src/main/javascript/Variant.js | 6 +- .../src/main/javascript/VariantOperation.js | 6 +- .../pyopencga/rest_clients/admin_client.py | 10 +--- .../rest_clients/alignment_client.py | 10 +--- .../rest_clients/clinical_analysis_client.py | 14 +---- .../pyopencga/rest_clients/cohort_client.py | 10 +--- .../rest_clients/disease_panel_client.py | 10 +--- .../pyopencga/rest_clients/family_client.py | 10 +--- .../pyopencga/rest_clients/file_client.py | 10 +--- .../pyopencga/rest_clients/ga4gh_client.py | 10 +--- .../rest_clients/individual_client.py | 10 +--- .../pyopencga/rest_clients/job_client.py | 10 +--- .../pyopencga/rest_clients/meta_client.py | 10 +--- .../rest_clients/organization_client.py | 2 +- .../pyopencga/rest_clients/project_client.py | 10 +--- .../pyopencga/rest_clients/sample_client.py | 10 +--- .../pyopencga/rest_clients/study_client.py | 10 +--- .../pyopencga/rest_clients/user_client.py | 10 +--- .../pyopencga/rest_clients/variant_client.py | 10 +--- .../rest_clients/variant_operation_client.py | 10 +--- 76 files changed, 101 insertions(+), 593 deletions(-) diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java index 95204c373d9..0f009f6ab08 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpenCgaCompleter.java @@ -1,9 +1,5 @@ /* -<<<<<<< HEAD -* Copyright 2015-2024-02-02 OpenCB -======= -* Copyright 2015-2024-03-04 OpenCB ->>>>>>> develop +* Copyright 2015-2024-03-06 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,11 +60,7 @@ public abstract class OpenCgaCompleter implements Completer { .map(Candidate::new) .collect(toList()); -<<<<<<< HEAD - private List clinicalList = asList( "acl-update","annotation-sets-load","clinical-configuration-update","create","distinct","interpretation-distinct","interpretation-search","interpretation-info","interpreter-cancer-tiering-run","interpreter-exomiser-run","interpreter-team-run","interpreter-tiering-run","interpreter-zetta-run","rga-aggregation-stats","rga-gene-query","rga-gene-summary","rga-index-run","rga-individual-query","rga-individual-summary","rga-variant-query","rga-variant-summary","search","variant-query","acl","delete","update","annotation-sets-annotations-update","info","interpretation-create","interpretation-clear","interpretation-delete","interpretation-revert","interpretation-update","report-update") -======= - private List clinicalList = asList( "acl-update","annotation-sets-load","clinical-configuration-update","create","distinct","interpretation-distinct","interpretation-search","interpretation-info","interpreter-cancer-tiering-run","interpreter-exomiser-run","interpreter-team-run","interpreter-tiering-run","interpreter-zetta-run","load","rga-aggregation-stats","rga-gene-query","rga-gene-summary","rga-index-run","rga-individual-query","rga-individual-summary","rga-variant-query","rga-variant-summary","search","variant-query","acl","delete","update","annotation-sets-annotations-update","info","interpretation-create","interpretation-clear","interpretation-delete","interpretation-revert","interpretation-update") ->>>>>>> develop + private List clinicalList = asList( "acl-update","annotation-sets-load","clinical-configuration-update","create","distinct","interpretation-distinct","interpretation-search","interpretation-info","interpreter-cancer-tiering-run","interpreter-exomiser-run","interpreter-team-run","interpreter-tiering-run","interpreter-zetta-run","load","rga-aggregation-stats","rga-gene-query","rga-gene-summary","rga-index-run","rga-individual-query","rga-individual-summary","rga-variant-query","rga-variant-summary","search","variant-query","acl","delete","update","annotation-sets-annotations-update","info","interpretation-create","interpretation-clear","interpretation-delete","interpretation-revert","interpretation-update","report-update") .stream() .map(Candidate::new) .collect(toList()); diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java index abcd6a4bff6..cde7fcb1c81 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/OpencgaCliOptionsParser.java @@ -1,9 +1,5 @@ /* -<<<<<<< HEAD -* Copyright 2015-2024-02-02 OpenCB -======= -* Copyright 2015-2024-03-04 OpenCB ->>>>>>> develop +* Copyright 2015-2024-03-06 OpenCB * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java index c340c24504e..fcfe1679c19 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/options/AnalysisClinicalCommandOptions.java @@ -2331,7 +2331,7 @@ public class UpdateReportCommandOptions { @Parameter(names = {"--clinical-analysis"}, description = "Clinical analysis ID", required = true, arity = 1) public String clinicalAnalysis; - @Parameter(names = {"--study", "-s"}, description = "Study [[user@]project:]study where study and project can be either the ID or UUID", required = false, arity = 1) + @Parameter(names = {"--study", "-s"}, description = "Study [[organization@]project:]study where study and project can be either the ID or UUID", required = false, arity = 1) public String study; @Parameter(names = {"--supporting-evidences-action"}, description = "Action to be performed if the array of supporting evidences is being updated.", required = false, arity = 1) diff --git a/opencga-client/src/main/R/R/Admin-methods.R b/opencga-client/src/main/R/R/Admin-methods.R index 90edfaea7d0..43589f23862 100644 --- a/opencga-client/src/main/R/R/Admin-methods.R +++ b/opencga-client/src/main/R/R/Admin-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Alignment-methods.R b/opencga-client/src/main/R/R/Alignment-methods.R index 432d05b886b..a4737b602d6 100644 --- a/opencga-client/src/main/R/R/Alignment-methods.R +++ b/opencga-client/src/main/R/R/Alignment-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/AllGenerics.R b/opencga-client/src/main/R/R/AllGenerics.R index 35d5ee51ff0..46e1629cd2e 100644 --- a/opencga-client/src/main/R/R/AllGenerics.R +++ b/opencga-client/src/main/R/R/AllGenerics.R @@ -5,79 +5,47 @@ setGeneric("organizationClient", function(OpencgaR, organization, endpointName, # ############################################################################## ## UserClient -<<<<<<< HEAD -setGeneric("userClient", function(OpencgaR, user, users, filterId, endpointName, params=NULL, ...) -======= setGeneric("userClient", function(OpencgaR, user, filterId, users, endpointName, params=NULL, ...) ->>>>>>> develop standardGeneric("userClient")) # ############################################################################## ## ProjectClient -setGeneric("projectClient", function(OpencgaR, project, projects, endpointName, params=NULL, ...) +setGeneric("projectClient", function(OpencgaR, projects, project, endpointName, params=NULL, ...) standardGeneric("projectClient")) # ############################################################################## ## StudyClient -<<<<<<< HEAD -setGeneric("studyClient", function(OpencgaR, members, study, group, variableSet, templateId, studies, endpointName, params=NULL, ...) -======= -setGeneric("studyClient", function(OpencgaR, group, members, templateId, studies, study, variableSet, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("studyClient", function(OpencgaR, group, variableSet, studies, templateId, study, members, endpointName, params=NULL, ...) standardGeneric("studyClient")) # ############################################################################## ## FileClient -<<<<<<< HEAD -setGeneric("fileClient", function(OpencgaR, members, folder, file, annotationSet, files, endpointName, params=NULL, ...) -======= -setGeneric("fileClient", function(OpencgaR, file, annotationSet, members, files, folder, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("fileClient", function(OpencgaR, files, folder, file, members, annotationSet, endpointName, params=NULL, ...) standardGeneric("fileClient")) # ############################################################################## ## JobClient -<<<<<<< HEAD -setGeneric("jobClient", function(OpencgaR, jobs, members, job, endpointName, params=NULL, ...) -======= -setGeneric("jobClient", function(OpencgaR, job, members, jobs, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("jobClient", function(OpencgaR, jobs, job, members, endpointName, params=NULL, ...) standardGeneric("jobClient")) # ############################################################################## ## SampleClient -<<<<<<< HEAD -setGeneric("sampleClient", function(OpencgaR, annotationSet, members, sample, samples, endpointName, params=NULL, ...) -======= -setGeneric("sampleClient", function(OpencgaR, members, annotationSet, sample, samples, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("sampleClient", function(OpencgaR, annotationSet, sample, samples, members, endpointName, params=NULL, ...) standardGeneric("sampleClient")) # ############################################################################## ## IndividualClient -<<<<<<< HEAD -setGeneric("individualClient", function(OpencgaR, individual, annotationSet, members, individuals, endpointName, params=NULL, ...) -======= -setGeneric("individualClient", function(OpencgaR, individual, members, annotationSet, individuals, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("individualClient", function(OpencgaR, individuals, individual, annotationSet, members, endpointName, params=NULL, ...) standardGeneric("individualClient")) # ############################################################################## ## FamilyClient -<<<<<<< HEAD -setGeneric("familyClient", function(OpencgaR, families, annotationSet, members, family, endpointName, params=NULL, ...) -======= -setGeneric("familyClient", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("familyClient", function(OpencgaR, annotationSet, families, family, members, endpointName, params=NULL, ...) standardGeneric("familyClient")) # ############################################################################## ## CohortClient -<<<<<<< HEAD -setGeneric("cohortClient", function(OpencgaR, annotationSet, members, cohort, cohorts, endpointName, params=NULL, ...) -======= -setGeneric("cohortClient", function(OpencgaR, cohort, members, annotationSet, cohorts, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("cohortClient", function(OpencgaR, annotationSet, cohort, cohorts, members, endpointName, params=NULL, ...) standardGeneric("cohortClient")) # ############################################################################## @@ -97,11 +65,7 @@ setGeneric("variantClient", function(OpencgaR, endpointName, params=NULL, ...) # ############################################################################## ## ClinicalClient -<<<<<<< HEAD -setGeneric("clinicalClient", function(OpencgaR, interpretations, members, interpretation, clinicalAnalysis, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) -======= -setGeneric("clinicalClient", function(OpencgaR, annotationSet, clinicalAnalysis, interpretations, members, clinicalAnalyses, interpretation, endpointName, params=NULL, ...) ->>>>>>> develop +setGeneric("clinicalClient", function(OpencgaR, interpretation, clinicalAnalyses, interpretations, members, annotationSet, clinicalAnalysis, endpointName, params=NULL, ...) standardGeneric("clinicalClient")) # ############################################################################## @@ -116,7 +80,7 @@ setGeneric("metaClient", function(OpencgaR, endpointName, params=NULL, ...) # ############################################################################## ## GA4GHClient -setGeneric("ga4ghClient", function(OpencgaR, file, study, endpointName, params=NULL, ...) +setGeneric("ga4ghClient", function(OpencgaR, study, file, endpointName, params=NULL, ...) standardGeneric("ga4ghClient")) # ############################################################################## diff --git a/opencga-client/src/main/R/R/Clinical-methods.R b/opencga-client/src/main/R/R/Clinical-methods.R index e7f11ac4f23..344b137d60b 100644 --- a/opencga-client/src/main/R/R/Clinical-methods.R +++ b/opencga-client/src/main/R/R/Clinical-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -66,11 +62,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("clinicalClient", "OpencgaR", function(OpencgaR, interpretations, members, interpretation, clinicalAnalysis, annotationSet, clinicalAnalyses, endpointName, params=NULL, ...) { -======= -setMethod("clinicalClient", "OpencgaR", function(OpencgaR, annotationSet, clinicalAnalysis, interpretations, members, clinicalAnalyses, interpretation, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("clinicalClient", "OpencgaR", function(OpencgaR, interpretation, clinicalAnalyses, interpretations, members, annotationSet, clinicalAnalysis, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/analysis/clinical/acl/{members}/update: @@ -742,7 +734,7 @@ setMethod("clinicalClient", "OpencgaR", function(OpencgaR, annotationSet, clinic #' @param include Fields included in the response, whole JSON path must be provided. #' @param exclude Fields excluded in the response, whole JSON path must be provided. #' @param clinicalAnalysis Clinical analysis ID. - #' @param study Study [[user@]project:]study where study and project can be either the ID or UUID. + #' @param study Study [[organization@]project:]study where study and project can be either the ID or UUID. #' @param commentsAction Action to be performed if the array of comments is being updated. Allowed values: ['ADD REMOVE REPLACE'] #' @param supportingEvidencesAction Action to be performed if the array of supporting evidences is being updated. Allowed values: ['ADD SET REMOVE'] #' @param filesAction Action to be performed if the array of files is being updated. Allowed values: ['ADD SET REMOVE'] diff --git a/opencga-client/src/main/R/R/Cohort-methods.R b/opencga-client/src/main/R/R/Cohort-methods.R index 7ebcab3a671..3ce27c32038 100644 --- a/opencga-client/src/main/R/R/Cohort-methods.R +++ b/opencga-client/src/main/R/R/Cohort-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -42,11 +38,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("cohortClient", "OpencgaR", function(OpencgaR, annotationSet, members, cohort, cohorts, endpointName, params=NULL, ...) { -======= -setMethod("cohortClient", "OpencgaR", function(OpencgaR, cohort, members, annotationSet, cohorts, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("cohortClient", "OpencgaR", function(OpencgaR, annotationSet, cohort, cohorts, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/cohorts/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Family-methods.R b/opencga-client/src/main/R/R/Family-methods.R index 23f63c466b0..dbcce8bb0f4 100644 --- a/opencga-client/src/main/R/R/Family-methods.R +++ b/opencga-client/src/main/R/R/Family-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -41,11 +37,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("familyClient", "OpencgaR", function(OpencgaR, families, annotationSet, members, family, endpointName, params=NULL, ...) { -======= -setMethod("familyClient", "OpencgaR", function(OpencgaR, members, annotationSet, families, family, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("familyClient", "OpencgaR", function(OpencgaR, annotationSet, families, family, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/families/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/File-methods.R b/opencga-client/src/main/R/R/File-methods.R index b615307621d..eef565b95bd 100644 --- a/opencga-client/src/main/R/R/File-methods.R +++ b/opencga-client/src/main/R/R/File-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -57,11 +53,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("fileClient", "OpencgaR", function(OpencgaR, members, folder, file, annotationSet, files, endpointName, params=NULL, ...) { -======= -setMethod("fileClient", "OpencgaR", function(OpencgaR, file, annotationSet, members, files, folder, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("fileClient", "OpencgaR", function(OpencgaR, files, folder, file, members, annotationSet, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/files/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/GA4GH-methods.R b/opencga-client/src/main/R/R/GA4GH-methods.R index f7385d8f7f7..17d147c2798 100644 --- a/opencga-client/src/main/R/R/GA4GH-methods.R +++ b/opencga-client/src/main/R/R/GA4GH-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -35,7 +31,7 @@ #' [*]: Required parameter #' @export -setMethod("ga4ghClient", "OpencgaR", function(OpencgaR, file, study, endpointName, params=NULL, ...) { +setMethod("ga4ghClient", "OpencgaR", function(OpencgaR, study, file, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/ga4gh/reads/search: diff --git a/opencga-client/src/main/R/R/Individual-methods.R b/opencga-client/src/main/R/R/Individual-methods.R index e9c5d054615..a30c8ceea99 100644 --- a/opencga-client/src/main/R/R/Individual-methods.R +++ b/opencga-client/src/main/R/R/Individual-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -42,11 +38,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("individualClient", "OpencgaR", function(OpencgaR, individual, annotationSet, members, individuals, endpointName, params=NULL, ...) { -======= -setMethod("individualClient", "OpencgaR", function(OpencgaR, individual, members, annotationSet, individuals, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("individualClient", "OpencgaR", function(OpencgaR, individuals, individual, annotationSet, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/individuals/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Job-methods.R b/opencga-client/src/main/R/R/Job-methods.R index ef04dc561c1..160c20df412 100644 --- a/opencga-client/src/main/R/R/Job-methods.R +++ b/opencga-client/src/main/R/R/Job-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -43,11 +39,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("jobClient", "OpencgaR", function(OpencgaR, jobs, members, job, endpointName, params=NULL, ...) { -======= -setMethod("jobClient", "OpencgaR", function(OpencgaR, job, members, jobs, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("jobClient", "OpencgaR", function(OpencgaR, jobs, job, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/jobs/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Meta-methods.R b/opencga-client/src/main/R/R/Meta-methods.R index b1c19871baa..fcc109a5112 100644 --- a/opencga-client/src/main/R/R/Meta-methods.R +++ b/opencga-client/src/main/R/R/Meta-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Operation-methods.R b/opencga-client/src/main/R/R/Operation-methods.R index f718b651ed5..c737760155a 100644 --- a/opencga-client/src/main/R/R/Operation-methods.R +++ b/opencga-client/src/main/R/R/Operation-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Organization-methods.R b/opencga-client/src/main/R/R/Organization-methods.R index 016e3650dab..1b95ae54c73 100644 --- a/opencga-client/src/main/R/R/Organization-methods.R +++ b/opencga-client/src/main/R/R/Organization-methods.R @@ -2,7 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -# Autogenerated on: 2024-03-04 +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Panel-methods.R b/opencga-client/src/main/R/R/Panel-methods.R index 79a6a3cb118..4cd2e9a9026 100644 --- a/opencga-client/src/main/R/R/Panel-methods.R +++ b/opencga-client/src/main/R/R/Panel-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/R/R/Project-methods.R b/opencga-client/src/main/R/R/Project-methods.R index ace5102b4cd..893fbbb0b03 100644 --- a/opencga-client/src/main/R/R/Project-methods.R +++ b/opencga-client/src/main/R/R/Project-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -37,7 +33,7 @@ #' [*]: Required parameter #' @export -setMethod("projectClient", "OpencgaR", function(OpencgaR, project, projects, endpointName, params=NULL, ...) { +setMethod("projectClient", "OpencgaR", function(OpencgaR, projects, project, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/projects/create: diff --git a/opencga-client/src/main/R/R/Sample-methods.R b/opencga-client/src/main/R/R/Sample-methods.R index b8d22ef98a8..b224bd8f5bb 100644 --- a/opencga-client/src/main/R/R/Sample-methods.R +++ b/opencga-client/src/main/R/R/Sample-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -42,11 +38,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("sampleClient", "OpencgaR", function(OpencgaR, annotationSet, members, sample, samples, endpointName, params=NULL, ...) { -======= -setMethod("sampleClient", "OpencgaR", function(OpencgaR, members, annotationSet, sample, samples, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("sampleClient", "OpencgaR", function(OpencgaR, annotationSet, sample, samples, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/samples/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/Study-methods.R b/opencga-client/src/main/R/R/Study-methods.R index b255a1f67c5..afd4f0b0ac8 100644 --- a/opencga-client/src/main/R/R/Study-methods.R +++ b/opencga-client/src/main/R/R/Study-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -49,11 +45,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("studyClient", "OpencgaR", function(OpencgaR, members, study, group, variableSet, templateId, studies, endpointName, params=NULL, ...) { -======= -setMethod("studyClient", "OpencgaR", function(OpencgaR, group, members, templateId, studies, study, variableSet, endpointName, params=NULL, ...) { ->>>>>>> develop +setMethod("studyClient", "OpencgaR", function(OpencgaR, group, variableSet, studies, templateId, study, members, endpointName, params=NULL, ...) { switch(endpointName, #' @section Endpoint /{apiVersion}/studies/acl/{members}/update: diff --git a/opencga-client/src/main/R/R/User-methods.R b/opencga-client/src/main/R/R/User-methods.R index 41adcfb5d15..25617309de6 100644 --- a/opencga-client/src/main/R/R/User-methods.R +++ b/opencga-client/src/main/R/R/User-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. @@ -43,11 +39,7 @@ #' [*]: Required parameter #' @export -<<<<<<< HEAD -setMethod("userClient", "OpencgaR", function(OpencgaR, user, users, filterId, endpointName, params=NULL, ...) { -======= setMethod("userClient", "OpencgaR", function(OpencgaR, user, filterId, users, endpointName, params=NULL, ...) { ->>>>>>> develop switch(endpointName, #' @section Endpoint /{apiVersion}/users/anonymous: diff --git a/opencga-client/src/main/R/R/Variant-methods.R b/opencga-client/src/main/R/R/Variant-methods.R index b0cefa25eeb..264763867fa 100644 --- a/opencga-client/src/main/R/R/Variant-methods.R +++ b/opencga-client/src/main/R/R/Variant-methods.R @@ -2,11 +2,7 @@ # WARNING: AUTOGENERATED CODE # # This code was generated by a tool. -<<<<<<< HEAD -# Autogenerated on: 2024-02-02 -======= -# Autogenerated on: 2024-03-04 ->>>>>>> develop +# Autogenerated on: 2024-03-06 # # Manual changes to this file may cause unexpected behavior in your application. # Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java index 1d0b8fd2c6d..cece90a3732 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AdminClient.java @@ -37,11 +37,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -50,11 +46,7 @@ /** * This class contains methods for the Admin webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: admin */ public class AdminClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java index 0d89e25e107..14eea5a5950 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/AlignmentClient.java @@ -40,11 +40,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -53,11 +49,7 @@ /** * This class contains methods for the Alignment webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: analysis/alignment */ public class AlignmentClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java index 82cd13f3b1b..1b7b219afe9 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ClinicalAnalysisClient.java @@ -55,11 +55,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -68,11 +64,7 @@ /** * This class contains methods for the ClinicalAnalysis webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: analysis/clinical */ public class ClinicalAnalysisClient extends AbstractParentClient { @@ -1014,7 +1006,7 @@ public RestResponse updateInterpretation(String clinicalAnalysis * @param params Map containing any of the following optional parameters. * include: Fields included in the response, whole JSON path must be provided. * exclude: Fields excluded in the response, whole JSON path must be provided. - * study: Study [[user@]project:]study where study and project can be either the ID or UUID. + * study: Study [[organization@]project:]study where study and project can be either the ID or UUID. * commentsAction: Action to be performed if the array of comments is being updated. * supportingEvidencesAction: Action to be performed if the array of supporting evidences is being updated. * filesAction: Action to be performed if the array of files is being updated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java index 02a057b6d8e..db414f80780 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/CohortClient.java @@ -36,11 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -49,11 +45,7 @@ /** * This class contains methods for the Cohort webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: cohorts */ public class CohortClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java index fc75ec986e7..f196e712076 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/DiseasePanelClient.java @@ -35,11 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -48,11 +44,7 @@ /** * This class contains methods for the DiseasePanel webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: panels */ public class DiseasePanelClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java index 51d7850ae11..0687b39811e 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FamilyClient.java @@ -35,11 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -48,11 +44,7 @@ /** * This class contains methods for the Family webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: families */ public class FamilyClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java index b29f3396ca9..680e134178f 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/FileClient.java @@ -42,11 +42,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -55,11 +51,7 @@ /** * This class contains methods for the File webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: files */ public class FileClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java index a22d897ea61..f60884bfc32 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/GA4GHClient.java @@ -27,11 +27,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -40,11 +36,7 @@ /** * This class contains methods for the GA4GH webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: ga4gh */ public class GA4GHClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java index 029a533b5ca..2377d530fb4 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/IndividualClient.java @@ -35,11 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -48,11 +44,7 @@ /** * This class contains methods for the Individual webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: individuals */ public class IndividualClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java index 4be618dbab8..eec7ad233d3 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/JobClient.java @@ -36,11 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -49,11 +45,7 @@ /** * This class contains methods for the Job webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: jobs */ public class JobClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java index 974034e3c00..edc9bfa3dd7 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/MetaClient.java @@ -28,11 +28,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -41,11 +37,7 @@ /** * This class contains methods for the Meta webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: meta */ public class MetaClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/OrganizationClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/OrganizationClient.java index ac14662b2fc..55330d49dcc 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/OrganizationClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/OrganizationClient.java @@ -30,7 +30,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -* Autogenerated on: 2024-03-04 +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java index 3e960991c45..878a3d679e9 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/ProjectClient.java @@ -31,11 +31,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -44,11 +40,7 @@ /** * This class contains methods for the Project webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: projects */ public class ProjectClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java index de59008c429..3426ea51565 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/SampleClient.java @@ -35,11 +35,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -48,11 +44,7 @@ /** * This class contains methods for the Sample webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: samples */ public class SampleClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java index 27f96bf374b..81a4a7bbc85 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/StudyClient.java @@ -44,11 +44,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -57,11 +53,7 @@ /** * This class contains methods for the Study webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: studies */ public class StudyClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java index 80e1824f2d6..b2e525f244b 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/UserClient.java @@ -36,11 +36,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -49,11 +45,7 @@ /** * This class contains methods for the User webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: users */ public class UserClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java index a43274342a3..fbd8a7f28f3 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantClient.java @@ -62,11 +62,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -75,11 +71,7 @@ /** * This class contains methods for the Variant webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: analysis/variant */ public class VariantClient extends AbstractParentClient { diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java index b7b2ad670ac..9dea80db8ff 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/clients/VariantOperationClient.java @@ -50,11 +50,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD -* Autogenerated on: 2024-02-02 -======= -* Autogenerated on: 2024-03-04 ->>>>>>> develop +* Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -63,11 +59,7 @@ /** * This class contains methods for the VariantOperation webservices. -<<<<<<< HEAD - * Client version: 2.12.2-SNAPSHOT -======= * Client version: 3.0.0-SNAPSHOT ->>>>>>> develop * PATH: operation */ public class VariantOperationClient extends AbstractParentClient { diff --git a/opencga-client/src/main/javascript/Admin.js b/opencga-client/src/main/javascript/Admin.js index 64a269c01ed..5997bed882d 100644 --- a/opencga-client/src/main/javascript/Admin.js +++ b/opencga-client/src/main/javascript/Admin.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Alignment.js b/opencga-client/src/main/javascript/Alignment.js index 1b7f9f761c2..9173d6738dc 100644 --- a/opencga-client/src/main/javascript/Alignment.js +++ b/opencga-client/src/main/javascript/Alignment.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/ClinicalAnalysis.js b/opencga-client/src/main/javascript/ClinicalAnalysis.js index 591b16653f6..2d47cced785 100644 --- a/opencga-client/src/main/javascript/ClinicalAnalysis.js +++ b/opencga-client/src/main/javascript/ClinicalAnalysis.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. @@ -870,7 +866,7 @@ export default class ClinicalAnalysis extends OpenCGAParentClass { * @param {Object} [params] - The Object containing the following optional parameters: * @param {String} [params.include] - Fields included in the response, whole JSON path must be provided. * @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided. - * @param {String} [params.study] - Study [[user@]project:]study where study and project can be either the ID or UUID. + * @param {String} [params.study] - Study [[organization@]project:]study where study and project can be either the ID or UUID. * @param {"ADD REMOVE REPLACE"} [params.commentsAction = "ADD"] - Action to be performed if the array of comments is being updated. The * default value is ADD. * @param {"ADD SET REMOVE"} [params.supportingEvidencesAction = "ADD"] - Action to be performed if the array of supporting evidences is diff --git a/opencga-client/src/main/javascript/Cohort.js b/opencga-client/src/main/javascript/Cohort.js index 6be1fb757e0..237d874af6f 100644 --- a/opencga-client/src/main/javascript/Cohort.js +++ b/opencga-client/src/main/javascript/Cohort.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/DiseasePanel.js b/opencga-client/src/main/javascript/DiseasePanel.js index d273463007e..44b47ec7d9f 100644 --- a/opencga-client/src/main/javascript/DiseasePanel.js +++ b/opencga-client/src/main/javascript/DiseasePanel.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Family.js b/opencga-client/src/main/javascript/Family.js index ec4a259a515..028113d98b3 100644 --- a/opencga-client/src/main/javascript/Family.js +++ b/opencga-client/src/main/javascript/Family.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/File.js b/opencga-client/src/main/javascript/File.js index 119fc635bbf..4419c507e8e 100644 --- a/opencga-client/src/main/javascript/File.js +++ b/opencga-client/src/main/javascript/File.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/GA4GH.js b/opencga-client/src/main/javascript/GA4GH.js index 4f6b5d66b90..b06055721c4 100644 --- a/opencga-client/src/main/javascript/GA4GH.js +++ b/opencga-client/src/main/javascript/GA4GH.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Individual.js b/opencga-client/src/main/javascript/Individual.js index 2c20d3cc516..a3307d522da 100644 --- a/opencga-client/src/main/javascript/Individual.js +++ b/opencga-client/src/main/javascript/Individual.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Job.js b/opencga-client/src/main/javascript/Job.js index f429d2db5f3..b83184040e6 100644 --- a/opencga-client/src/main/javascript/Job.js +++ b/opencga-client/src/main/javascript/Job.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Meta.js b/opencga-client/src/main/javascript/Meta.js index 6f48debfc9e..7028dd5ea71 100644 --- a/opencga-client/src/main/javascript/Meta.js +++ b/opencga-client/src/main/javascript/Meta.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Organization.js b/opencga-client/src/main/javascript/Organization.js index 5102f6b76b5..3884dc598da 100644 --- a/opencga-client/src/main/javascript/Organization.js +++ b/opencga-client/src/main/javascript/Organization.js @@ -12,7 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. - * Autogenerated on: 2024-03-04 + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Project.js b/opencga-client/src/main/javascript/Project.js index 08abd83dbe8..3767afc6bca 100644 --- a/opencga-client/src/main/javascript/Project.js +++ b/opencga-client/src/main/javascript/Project.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Sample.js b/opencga-client/src/main/javascript/Sample.js index 1d552d1ea25..1d4f379fa33 100644 --- a/opencga-client/src/main/javascript/Sample.js +++ b/opencga-client/src/main/javascript/Sample.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Study.js b/opencga-client/src/main/javascript/Study.js index 2de49ab20cb..b170fbf1c16 100644 --- a/opencga-client/src/main/javascript/Study.js +++ b/opencga-client/src/main/javascript/Study.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/User.js b/opencga-client/src/main/javascript/User.js index 542bba9c384..c5c7544c653 100644 --- a/opencga-client/src/main/javascript/User.js +++ b/opencga-client/src/main/javascript/User.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/Variant.js b/opencga-client/src/main/javascript/Variant.js index 2e551118709..98d42a16fd2 100644 --- a/opencga-client/src/main/javascript/Variant.js +++ b/opencga-client/src/main/javascript/Variant.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/javascript/VariantOperation.js b/opencga-client/src/main/javascript/VariantOperation.js index 21b21feff78..9ceb02dd57d 100644 --- a/opencga-client/src/main/javascript/VariantOperation.js +++ b/opencga-client/src/main/javascript/VariantOperation.js @@ -12,11 +12,7 @@ * WARNING: AUTOGENERATED CODE * * This code was generated by a tool. -<<<<<<< HEAD - * Autogenerated on: 2024-02-02 -======= - * Autogenerated on: 2024-03-04 ->>>>>>> develop + * Autogenerated on: 2024-03-06 * * Manual changes to this file may cause unexpected behavior in your application. * Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py index 3c4bfd4e1ed..85bf0da3b3e 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/admin_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Admin(_ParentRestClient): """ This class contains methods for the 'Admin' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/admin """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py index 315f01380a0..34e898b9f67 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/alignment_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Alignment(_ParentRestClient): """ This class contains methods for the 'Analysis - Alignment' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/analysis/alignment """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py index 00366d7f79a..0cdeeda33d7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/clinical_analysis_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class ClinicalAnalysis(_ParentRestClient): """ This class contains methods for the 'Analysis - Clinical' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/analysis/clinical """ @@ -1108,8 +1100,8 @@ def update_report(self, clinical_analysis, data=None, **options): must be provided. :param str exclude: Fields excluded in the response, whole JSON path must be provided. - :param str study: Study [[user@]project:]study where study and project - can be either the ID or UUID. + :param str study: Study [[organization@]project:]study where study and + project can be either the ID or UUID. :param str comments_action: Action to be performed if the array of comments is being updated. Allowed values: ['ADD REMOVE REPLACE'] :param str supporting_evidences_action: Action to be performed if the diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py index 1f884ac1133..d0081675985 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/cohort_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Cohort(_ParentRestClient): """ This class contains methods for the 'Cohorts' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/cohorts """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py index d305a445e47..ad7fc8a94a5 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/disease_panel_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class DiseasePanel(_ParentRestClient): """ This class contains methods for the 'Disease Panels' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/panels """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py index 3a625dcd693..a2d849ec0b7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/family_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Family(_ParentRestClient): """ This class contains methods for the 'Families' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/families """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py index 1ea7c212f62..b9b998ba72f 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/file_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class File(_ParentRestClient): """ This class contains methods for the 'Files' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/files """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py index 165ebf5dd3a..01f77db3bac 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/ga4gh_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class GA4GH(_ParentRestClient): """ This class contains methods for the 'GA4GH' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/ga4gh """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py index 257eaaca77e..7243a4f0865 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/individual_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Individual(_ParentRestClient): """ This class contains methods for the 'Individuals' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/individuals """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py index 26fb036e601..e37e64878e3 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/job_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Job(_ParentRestClient): """ This class contains methods for the 'Jobs' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/jobs """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py index bfc097ab67e..515d9c60bcd 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/meta_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Meta(_ParentRestClient): """ This class contains methods for the 'Meta' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/meta """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/organization_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/organization_client.py index 7938fd9bed5..cac13370617 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/organization_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/organization_client.py @@ -2,7 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. - Autogenerated on: 2024-03-04 + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py index b497a51ed86..5e403ca5027 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/project_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Project(_ParentRestClient): """ This class contains methods for the 'Projects' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/projects """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py index cce64c1266c..e9307f29656 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/sample_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Sample(_ParentRestClient): """ This class contains methods for the 'Samples' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/samples """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py index 26d84ece241..5c2907ee8e4 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/study_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Study(_ParentRestClient): """ This class contains methods for the 'Studies' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/studies """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py index 3f6348d3508..12e2c801ea7 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/user_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class User(_ParentRestClient): """ This class contains methods for the 'Users' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/users """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py index 5293d379501..99976a5ae1b 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class Variant(_ParentRestClient): """ This class contains methods for the 'Analysis - Variant' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/analysis/variant """ diff --git a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py index 9266b1648c7..9a9a5fca230 100644 --- a/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py +++ b/opencga-client/src/main/python/pyopencga/rest_clients/variant_operation_client.py @@ -2,11 +2,7 @@ WARNING: AUTOGENERATED CODE This code was generated by a tool. -<<<<<<< HEAD - Autogenerated on: 2024-02-02 -======= - Autogenerated on: 2024-03-04 ->>>>>>> develop + Autogenerated on: 2024-03-06 Manual changes to this file may cause unexpected behavior in your application. Manual changes to this file will be overwritten if the code is regenerated. @@ -18,11 +14,7 @@ class VariantOperation(_ParentRestClient): """ This class contains methods for the 'Operations - Variant Storage' webservices -<<<<<<< HEAD - Client version: 2.12.2-SNAPSHOT -======= Client version: 3.0.0-SNAPSHOT ->>>>>>> develop PATH: /{apiVersion}/operation """ From df495c18e082c7c7bb03112c216265fb06abe7be Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 6 Mar 2024 16:12:42 +0100 Subject: [PATCH 16/16] Deleted the folder opencga-storage-hadoop-deps #TASK-5618 --- .../pom.xml | 519 -------- .../pom.xml | 376 ------ .../pom.xml | 542 --------- .../opencga-storage-hadoop-deps/pom.xml | 1042 ----------------- 4 files changed, 2479 deletions(-) delete mode 100644 opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml delete mode 100644 opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml delete mode 100644 opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml delete mode 100644 opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml deleted file mode 100644 index 2ef5c79bb53..00000000000 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml +++ /dev/null @@ -1,519 +0,0 @@ - - - - 4.0.0 - - - org.opencb.opencga - opencga-storage-hadoop-deps - 3.0.0-SNAPSHOT - ../pom.xml - - - - opencga-storage-hadoop-deps-emr6.1 - jar - - - ${artifactId} - - 3.2.1-amzn-1 - 2.2.5 - - - 2.2.1 - - 3.4.14 - 5.0.0-HBase-2.0 - 0.14.0-incubating - 0.7.0 - - 3.3.6 - 3.2.1 - 3.6.1 - - 1.18 - 2.5 - 3.6 - 2.12.0 - - 28.0-jre - - - - - - emr-6.1.0-artifacts - EMR 6.1.0 Releases Repository - - true - - - false - - https://s3.eu-west-2.amazonaws.com/eu-west-2-emr-artifacts/emr-6.1.0/repos/maven/ - - - - - - - - - com.google.protobuf - protobuf-java - ${protobuf2.version} - true - - - com.google.guava - guava - ${guava.version} - true - - - - - - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-aws - ${hadoop.version} - true - - - - - org.apache.hbase - hbase-server - ${hbase.version} - true - - - org.apache.hbase - hbase-mapreduce - ${hbase.version} - true - - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - true - - - - - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - true - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - test-jar - true - - - org.apache.hbase - hbase-it - ${hbase.version} - test-jar - true - - - - - - - - - - org.apache.htrace - htrace-core - 3.1.0-incubating - - - commons-cli - commons-cli - 1.2 - - - - - org.apache.avro - avro - - - org.apache.avro - avro-ipc - - - org.apache.avro - avro-mapred - hadoop2 - - - - - - - - - commons-lang - commons-lang - - - commons-logging - commons-logging - - - commons-io - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - - - org.fusesource.leveldbjni - leveldbjni-all - ${leveldbjni-all.version} - - - - - org.apache.directory.server - apacheds-kerberos-codec - compile - ${apacheds-kerberos-codec.version} - - - - - com.microsoft.azure - azure-storage - 2.0.0 - - - - org.mortbay.jetty - jetty-util - ${mortbay.jetty.version} - - - - - com.lmax - disruptor - ${disruptor.version} - - - - - - - - org.apache.commons - commons-math - ${commons-math.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - io.netty - netty-all - ${netty.version} - - - org.jamon - jamon-runtime - ${jamon-runtime.version} - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-xc - ${codehaus.jackson.version} - - - - - - org.antlr - antlr-runtime - ${antlr.version} - - - jline - jline - ${jline.version} - - - sqlline - sqlline - ${sqlline.version} - - - - - - - - - - - - - - - - - - org.apache.httpcomponents - httpclient - 4.0.1 - - - org.iq80.snappy - snappy - ${snappy.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-collections - commons-collections - ${collections.version} - - - org.apache.commons - commons-csv - ${commons-csv.version} - - - joda-time - joda-time - - - - - org.apache.hbase.thirdparty - hbase-shaded-netty - ${hbase-thirdparty.version} - - true - - - org.apache.tephra - tephra-api - ${apache.tephra.version} - - - org.apache.tephra - tephra-core - ${apache.tephra.version} - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - - - org.apache.tephra - tephra-hbase-compat-1.1 - ${apache.tephra.version} - - - - - - org.apache.commons - commons-configuration2 - 2.1.1 - - - org.apache.commons - commons-lang3 - - - - - - - org.apache.commons - commons-math3 - ${commons-math3.version} - - - - - io.dropwizard.metrics - metrics-core - ${io.dropwizard.metrics-core.version} - - - - - org.apache.htrace - htrace-core4 - 4.1.0-incubating - - - - com.google.re2j - re2j - 1.1 - - - - org.apache.hbase.thirdparty - hbase-shaded-protobuf - ${hbase-thirdparty.version} - - - - org.apache.hbase.thirdparty - hbase-shaded-miscellaneous - ${hbase-thirdparty.version} - - - org.apache.yetus - audience-annotations - 0.5.0 - - - - org.apache.hadoop - hadoop-azure-datalake - ${hadoop.version} - true - - - - org.wildfly.openssl - wildfly-openssl - 1.0.7.Final - - - - - \ No newline at end of file diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml deleted file mode 100644 index 5a162302e74..00000000000 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - 4.0.0 - - - org.opencb.opencga - opencga-storage-hadoop-deps - 3.0.0-SNAPSHOT - ../pom.xml - - - - opencga-storage-hadoop-deps-hdp2.6 - jar - - - ${artifactId} - - 2.6.5.298-4 - - - 2.7.3.${hdp.dependencies.version} - 1.1.2.${hdp.dependencies.version} - 4.7.0.${hdp.dependencies.version} - 0.7.0 - - - - - hortonworks-releases - https://repo.hortonworks.com/content/repositories/releases/ - - - hortonworks-public - https://repo.hortonworks.com/content/groups/public - - - - - - - com.google.protobuf - protobuf-java - ${protobuf2.version} - true - - - com.google.guava - guava - ${guava.version} - true - - - - - - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-azure - ${hadoop.version} - - - - org.apache.hadoop - hadoop-azure-datalake - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - - - org.apache.commons - commons-lang3 - - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - true - - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - true - - - - - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - true - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - test-jar - true - - - org.apache.hbase - hbase-it - ${hbase.version} - test-jar - true - - - - - - - - - org.apache.htrace - htrace-core - 3.1.0-incubating - - - commons-cli - commons-cli - 1.2 - - - - - org.apache.avro - avro - - - org.apache.avro - avro-ipc - - - org.apache.avro - avro-mapred - hadoop2 - - - - - commons-configuration - commons-configuration - - - commons-lang - commons-lang - - - commons-logging - commons-logging - - - commons-io - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - - - org.fusesource.leveldbjni - leveldbjni-all - ${leveldbjni-all.version} - - - - - org.apache.directory.server - apacheds-kerberos-codec - compile - ${apacheds-kerberos-codec.version} - - - - - com.microsoft.azure - azure-storage - 2.0.0 - - - - org.mortbay.jetty - jetty-util - ${mortbay.jetty.version} - - - - - com.lmax - disruptor - ${disruptor.version} - - - com.yammer.metrics - metrics-core - ${metrics-core.version} - - - org.apache.commons - commons-math - ${commons-math.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - io.netty - netty-all - ${netty.version} - - - org.jamon - jamon-runtime - ${jamon-runtime.version} - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-xc - ${codehaus.jackson.version} - - - - - - org.antlr - antlr-runtime - ${antlr.version} - - - jline - jline - ${jline.version} - - - sqlline - sqlline - ${sqlline.version} - - - co.cask.tephra - tephra-api - ${tephra.version} - - - co.cask.tephra - tephra-core - ${tephra.version} - - - co.cask.tephra - tephra-hbase-compat-1.1 - ${tephra.version} - - - org.apache.httpcomponents - httpclient - 4.0.1 - - - org.iq80.snappy - snappy - ${snappy.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-collections - commons-collections - ${collections.version} - - - org.apache.commons - commons-csv - ${commons-csv.version} - - - joda-time - joda-time - - - - \ No newline at end of file diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml deleted file mode 100644 index ee2c708c193..00000000000 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml +++ /dev/null @@ -1,542 +0,0 @@ - - - - 4.0.0 - - - org.opencb.opencga - opencga-storage-hadoop-deps - 3.0.0-SNAPSHOT - ../pom.xml - - - - opencga-storage-hadoop-deps-hdp3.1 - jar - - - ${artifactId} - 3.1.4.41-5 - - 3.1.1.${hdp.dependencies.version} - 2.0.2.${hdp.dependencies.version} - - 2.1.0 - 3.4.6 - 5.0.0.${hdp.dependencies.version} - 0.14.0-incubating - 0.7.0 - - 3.3.6 - 3.2.1 - 3.6.1 - - 1.18 - 2.5 - 3.6 - 2.12.0 - - 9.3.24.v20180605 - - 28.0-jre - - - - hortonworks-releases - https://repo.hortonworks.com/content/repositories/releases/ - - - hortonworks-public - https://repo.hortonworks.com/content/groups/public - - - - - - - - - com.google.protobuf - protobuf-java - ${protobuf2.version} - true - - - com.google.guava - guava - ${guava.version} - true - - - - - - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-azure - ${hadoop.version} - true - - - - - org.apache.hbase - hbase-server - ${hbase.version} - true - - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - true - - - - - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - true - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - test-jar - true - - - org.apache.hbase - hbase-it - ${hbase.version} - test-jar - true - - - - - - - - - - org.apache.htrace - htrace-core - 3.1.0-incubating - - - commons-cli - commons-cli - 1.2 - - - - - org.apache.avro - avro - - - org.apache.avro - avro-ipc - - - org.apache.avro - avro-mapred - hadoop2 - - - - - - - - - commons-lang - commons-lang - - - commons-logging - commons-logging - - - commons-io - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - true - - - org.eclipse.jetty - jetty-util - ${jetty.version} - true - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - true - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - true - - - org.eclipse.jetty - jetty-security - ${jetty.version} - true - - - org.eclipse.jetty - jetty-http - ${jetty.version} - true - - - org.eclipse.jetty - jetty-io - ${jetty.version} - true - - - - - org.fusesource.leveldbjni - leveldbjni-all - ${leveldbjni-all.version} - - - - - org.apache.directory.server - apacheds-kerberos-codec - compile - ${apacheds-kerberos-codec.version} - - - - - com.microsoft.azure - azure-storage - 2.0.0 - - - - org.mortbay.jetty - jetty-util - ${mortbay.jetty.version} - - - - - com.lmax - disruptor - ${disruptor.version} - - - - - - - - org.apache.commons - commons-math - ${commons-math.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - io.netty - netty-all - ${netty.version} - - - org.jamon - jamon-runtime - ${jamon-runtime.version} - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-xc - ${codehaus.jackson.version} - - - - - - org.antlr - antlr-runtime - ${antlr.version} - - - jline - jline - ${jline.version} - - - sqlline - sqlline - ${sqlline.version} - - - - - - - - - - - - - - - - - - org.apache.httpcomponents - httpclient - 4.0.1 - - - org.iq80.snappy - snappy - ${snappy.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-collections - commons-collections - ${collections.version} - - - org.apache.commons - commons-csv - ${commons-csv.version} - - - joda-time - joda-time - - - - - org.apache.hbase.thirdparty - hbase-shaded-netty - ${hbase-thirdparty.version} - - true - - - org.apache.tephra - tephra-api - ${apache.tephra.version} - - - org.apache.tephra - tephra-core - ${apache.tephra.version} - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - - - org.apache.tephra - tephra-hbase-compat-1.1 - ${apache.tephra.version} - - - - - - org.apache.commons - commons-configuration2 - 2.1.1 - - - org.apache.commons - commons-lang3 - - - - - - - org.apache.commons - commons-math3 - ${commons-math3.version} - - - - - io.dropwizard.metrics - metrics-core - ${io.dropwizard.metrics-core.version} - - - - - org.apache.htrace - htrace-core4 - 4.1.0-incubating - - - - com.google.re2j - re2j - 1.1 - - - - org.apache.hbase.thirdparty - hbase-shaded-protobuf - ${hbase-thirdparty.version} - - - - org.apache.hbase.thirdparty - hbase-shaded-miscellaneous - ${hbase-thirdparty.version} - - - org.apache.yetus - audience-annotations - 0.5.0 - - - - org.apache.hadoop - hadoop-azure-datalake - ${hadoop.version} - true - - - - org.wildfly.openssl - wildfly-openssl - 1.0.7.Final - - - - - \ No newline at end of file diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml deleted file mode 100644 index 9d9c1350046..00000000000 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml +++ /dev/null @@ -1,1042 +0,0 @@ - - - - - - 4.0.0 - - - org.opencb.opencga - opencga-storage-hadoop - 3.0.0-SNAPSHOT - ../pom.xml - - - - opencga-storage-hadoop-deps-hdp3.1 - opencga-storage-hadoop-deps-emr6.1 - opencga-storage-hadoop-deps-hdp2.6 - - - - - - - opencga-storage-hadoop-deps - pom - - - true - - - 2.7.3 - 1.1.2 - 4.7.0-HBase-1.1 - - 2.5.0 - 15.0 - - - 3.1 - 1.4.1 - 2.5 - 3.1 - 2.7.1 - 2.0.0-M15 - 1.8 - 3.4.6 - - - 2.2.0 - 3.3.0 - 2.2 - 4.0.23.Final - 2.4.1 - 1.9.13 - 6.1.26 - - - 1.6 - - 2.5 - 1.2 - 1.0 - 1.7 - 3.2.1 - 1.1.9 - 2.11 - 3.5.2 - 0.7.0 - 0.3 - - 1.6 - - - - - - - - - - com.google.protobuf - protobuf-java - ${protobuf2.version} - true - - - com.google.guava - guava - ${guava.version} - true - - - - - - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-azure - ${hadoop.version} - true - - - org.apache.hadoop - hadoop-common - - - org.apache.commons - commons-lang3 - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - true - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - org.mortbay.jetty - jsp-2.1 - - - org.mortbay.jetty - jsp-api-2.1 - - - org.mortbay.jetty - servlet-api-2.5 - - - org.mortbay.jetty - jetty-sslengine - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - com.lmax - disruptor - - - - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - true - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-client - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-azure - - - org.apache.hbase - hbase-server - - - org.apache.hbase - hbase-client - - - org.apache.hbase - hbase-compact - - - org.apache.hbase - hbase-hadoop-compat - - - org.apache.hbase - hbase-common - - - org.apache.hbase - hbase-protocol - - - org.apache.hbase - hbase-annotations - - - - - - - - - - - org.apache.htrace - htrace-core - 3.1.0-incubating - - - commons-cli - commons-cli - 1.2 - - - - - org.apache.avro - avro - ${avro.version} - - - org.apache.avro - avro-ipc - ${avro.version} - - - org.mortbay.jetty - servlet-api - - - jetty - org.mortbay.jetty - - - jetty-util - org.mortbay.jetty - - - - - org.apache.avro - avro-mapred - hadoop2 - ${avro.version} - - - org.mortbay.jetty - servlet-api - - - jetty - org.mortbay.jetty - - - jetty-util - org.mortbay.jetty - - - - - - - commons-configuration - commons-configuration - 1.6 - - - commons-lang - commons-lang - 2.6 - - - commons-logging - commons-logging - 1.1.3 - - - commons-io - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - jline - jline - - - org.jboss.netty - netty - - - - junit - junit - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - org.fusesource.leveldbjni - leveldbjni-all - ${leveldbjni-all.version} - - - - - org.apache.directory.server - apacheds-kerberos-codec - compile - ${apacheds-kerberos-codec.version} - - - org.apache.directory.api - api-asn1-ber - - - org.apache.directory.api - api-i18n - - - org.apache.directory.api - api-ldap-model - - - net.sf.ehcache - ehcache-core - - - - - - - com.microsoft.azure - azure-storage - 2.0.0 - - - org.apache.hadoop - hadoop-common - - - org.apache.commons - commons-lang3 - - - - - - org.mortbay.jetty - jetty-util - ${mortbay.jetty.version} - - - org.mortbay.jetty - servlet-api - - - - - - - com.lmax - disruptor - ${disruptor.version} - - - com.yammer.metrics - metrics-core - ${metrics-core.version} - - - org.apache.commons - commons-math - ${commons-math.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - io.netty - netty-all - ${netty.version} - - - org.jamon - jamon-runtime - ${jamon-runtime.version} - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-xc - ${codehaus.jackson.version} - - - - - - org.antlr - antlr-runtime - ${antlr.version} - - - jline - jline - ${jline.version} - - - sqlline - sqlline - ${sqlline.version} - - - co.cask.tephra - tephra-api - ${tephra.version} - - - co.cask.tephra - tephra-core - ${tephra.version} - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - - - co.cask.tephra - tephra-hbase-compat-1.1 - ${tephra.version} - - - org.apache.httpcomponents - httpclient - 4.0.1 - - - org.iq80.snappy - snappy - ${snappy.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-collections - commons-collections - ${collections.version} - - - org.apache.commons - commons-csv - ${commons-csv.version} - - - joda-time - joda-time - ${joda.version} - - - - - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - true - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - test-jar - true - - - org.apache.hbase - hbase-it - ${hbase.version} - test-jar - true - - - hbase-server - org.apache.hbase - - - - - - log4j - log4j - 1.2.17 - true - - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - my_install - - install - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - jar - - jar - - - true - - - - test-jar - - test-jar - - - tests - true - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - shade-main-jar - package - - shade - - - shaded - true - - true - true - true - - - - com.sun.jersey:jersey-server - - com/sun/jersey/server/impl/provider/RuntimeDelegateImpl* - - - - com.sun.jersey:jersey-client - - com/sun/ws/rs/ext/RuntimeDelegateImpl* - - - - - com.google.guava:guava - - com/google/common/io/Closeables* - com/google/common/base/Stopwatch* - com/google/common/base/Preconditions* - - - - org.apache.phoenix:phoenix-core - - com/codahale/metrics/* - - - - - - - - - - - - javax.ws.rs - shaded.javax.ws.rs - - - com.google.protobuf - shaded.com.google.protobuf - - - - com.google.common - shaded.com.google.common - - com.google.common.io.Closeables - com.google.common.base.Stopwatch - com.google.common.base.Preconditions - - - - - - - org.eclipse.jetty - shaded.org.eclipse.jetty - - org.eclipse.jetty.server.** - org.eclipse.jetty.webapp.** - org.eclipse.jetty.servlet.** - org.eclipse.jetty.security.** - org.eclipse.jetty.http.** - org.eclipse.jetty.io.** - org.eclipse.jetty.util.** - - - - - - - - - javax.ws.rs - - - com.sun.jersey - - - org.apache.hadoop - - org.apache.hbase - - - - - - - - - - org.apache.phoenix - - - - - com.google.guava - com.google.protobuf - - - org.apache.hbase.thirdparty:hbase-shaded-netty - - org.eclipse.jetty:jetty-server - org.eclipse.jetty:jetty-webapp - org.eclipse.jetty:jetty-servlet - org.eclipse.jetty:jetty-security - org.eclipse.jetty:jetty-http - org.eclipse.jetty:jetty-io - org.eclipse.jetty:jetty-util - - - - org.apache.hbase:**:tests - org.apache.hadoop:hadoop-minicluster - org.apache.hadoop:**:tests - org.mortbay.jetty:** - log4j:** - - - - - - - - - - - - - shade-test-jar - package - - shade - - - true - tests - true - - - - - - - - javax.ws.rs - shaded.javax.ws.rs - - - com.google.protobuf - shaded.com.google.protobuf - - - - com.google.common - shaded.com.google.common - - com.google.common.io.Closeables - com.google.common.base.Stopwatch - - - - - org.eclipse.jetty - shaded.org.eclipse.jetty - - org.eclipse.jetty.server.** - org.eclipse.jetty.webapp.** - org.eclipse.jetty.servlet.** - org.eclipse.jetty.security.** - org.eclipse.jetty.http.** - org.eclipse.jetty.io.** - org.eclipse.jetty.util.** - - - - - - - - - - - - org.apache.hbase:**:tests - org.apache.hadoop:hadoop-minicluster - org.apache.hadoop:**:tests - org.mortbay.jetty:servlet-api - org.mortbay.jetty:jetty - org.mortbay.jetty:jetty-util - org.mortbay.jetty:jetty-sslengine - log4j:** - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.0 - - - analyze - - analyze-only - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -