goci#882 Fix Ensembl version issue

EBISPOT · Jan 10, 2023 · c149453 · c149453
1 parent a15beff
commit c149453
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/...oci-data-mapping-services/src/main/java/uk/ac/ebi/spot/goci/component/EnsemblRelease.java b/...oci-data-mapping-services/src/main/java/uk/ac/ebi/spot/goci/component/EnsemblRelease.java
@@ -9,6 +9,9 @@
 import uk.ac.ebi.spot.goci.model.EnsemblReleaseJson;
 
 import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Created by Laurent on 22/09/15.
@@ -48,10 +51,14 @@ public int getReleaseVersion() throws EnsemblRestIOException {
         try {
             EnsemblReleaseJson ensemblReleaseJson = restTemplate.getForObject(url, EnsemblReleaseJson.class);
             getLog().info("Querying " + url);
-            int[] releases = ensemblReleaseJson.getReleases();
+            Integer[] releases = ensemblReleaseJson.getReleases();
+
 
             if (releases != null) {
-                if (releases.length == 1) {
+                List <Integer> rels = Arrays.asList(releases);
+                rels.sort(Comparator.reverseOrder());
+               //if (releases.length == 1) {
+                if(!rels.isEmpty()) {
                     currentEnsemblRelease = releases[0];
                 }
                 else {

diff --git a/...oci-data-mapping-services/src/main/java/uk/ac/ebi/spot/goci/model/EnsemblReleaseJson.java b/...oci-data-mapping-services/src/main/java/uk/ac/ebi/spot/goci/model/EnsemblReleaseJson.java
@@ -12,17 +12,17 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class EnsemblReleaseJson {
 
-    private int[] releases;
+    private Integer[] releases;
 
     public EnsemblReleaseJson() {
 
     }
 
-    public int[] getReleases() {
+    public Integer[] getReleases() {
         return releases;
     }
 
-    public void setReleases(int[] releases) {
+    public void setReleases(Integer[] releases) {
         this.releases = releases;
     }
 }
diff --git a/software-release.sh b/software-release.sh
@@ -6,7 +6,7 @@
 # Ensure all branches ready for release are merged into dev / master
 
 
-DEV_BRANCH='goci#383_Greater_Middle_Eastern_ancestry_category_is_not_imported'
+DEV_BRANCH='goci#882f-fix-Ensembl-versioning-code'
 
 MASTER_BRANCH='2.x-stable'