From 427f1ed30698476856d0be9f364834072353c2f1 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 7 Nov 2024 15:13:25 +0100 Subject: [PATCH] SCRUM-4190 fix checkstyle, create new flyway script --- .../jobs/executors/GeneOntologyAnnotationExecutor.java | 2 +- src/main/resources/db/migration/v0.38.0.2__gaf-load.sql | 2 +- src/main/resources/db/migration/v0.38.0.3__gaf-load.sql | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/db/migration/v0.38.0.3__gaf-load.sql diff --git a/src/main/java/org/alliancegenome/curation_api/jobs/executors/GeneOntologyAnnotationExecutor.java b/src/main/java/org/alliancegenome/curation_api/jobs/executors/GeneOntologyAnnotationExecutor.java index edba909b6..519f90500 100644 --- a/src/main/java/org/alliancegenome/curation_api/jobs/executors/GeneOntologyAnnotationExecutor.java +++ b/src/main/java/org/alliancegenome/curation_api/jobs/executors/GeneOntologyAnnotationExecutor.java @@ -60,7 +60,7 @@ public void execLoad(BulkLoadFileHistory bulkLoadFileHistory) throws IOException String orgID = token[0]; String modID = token[1]; String goID = token[4]; - if (abbr.equalsIgnoreCase(orgID) || (abbr.equals("HUMAN") && orgID.equals("RGD"))) { + if (abbr.equalsIgnoreCase(orgID) || abbr.equals("HUMAN") && orgID.equals("RGD")) { List goIDs = uiMap.computeIfAbsent(modID, list -> new ArrayList<>()); goIDs.add(goID); } diff --git a/src/main/resources/db/migration/v0.38.0.2__gaf-load.sql b/src/main/resources/db/migration/v0.38.0.2__gaf-load.sql index f9013b4e3..3f8d1ba2e 100644 --- a/src/main/resources/db/migration/v0.38.0.2__gaf-load.sql +++ b/src/main/resources/db/migration/v0.38.0.2__gaf-load.sql @@ -168,7 +168,7 @@ from bulkload where name = 'RGD GAF'; insert into bulkurlload (id, bulkloadurl) -select id, 'https://download.alliancegenome.org/2.3.0/GAF/HUMAN/GAF_HUMAN_1.gaf' +select id, 'https://www.ebi.ac.uk/gxa/species/Homo_sapiens/sitemap.xml?allEntries=true' from bulkload where name = 'HUMAN GAF'; diff --git a/src/main/resources/db/migration/v0.38.0.3__gaf-load.sql b/src/main/resources/db/migration/v0.38.0.3__gaf-load.sql new file mode 100644 index 000000000..1d134af61 --- /dev/null +++ b/src/main/resources/db/migration/v0.38.0.3__gaf-load.sql @@ -0,0 +1,3 @@ +update bulkurlload set bulkloadurl = 'https://download.alliancegenome.org/2.3.0/GAF/HUMAN/GAF_HUMAN_1.gaf' +where id = (select id from bulkload where name = 'HUMAN GAF'); +