X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblMap.java;h=16d16d2e8404f20941c21c1eb9235d1b36b1e939;hb=refs%2Fheads%2Ffeature%2FJAL-3730ensemblPingRetries;hp=8ca60deecc51d4d06dbb667438532d076c13de86;hpb=1c52130ad032d77caac874c3a8be23a399a3ec93;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblMap.java b/src/jalview/ext/ensembl/EnsemblMap.java
index 8ca60de..16d16d2 100644
--- a/src/jalview/ext/ensembl/EnsemblMap.java
+++ b/src/jalview/ext/ensembl/EnsemblMap.java
@@ -1,11 +1,25 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ext.ensembl;
 
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.DBRefSource;
-import jalview.datamodel.GeneLociI;
-import jalview.util.MapList;
-
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -13,12 +27,30 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
+import jalview.bin.Cache;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.DBRefSource;
+import jalview.datamodel.GeneLociI;
+import jalview.datamodel.GeneLocus;
+import jalview.datamodel.Mapping;
+import jalview.util.MapList;
+
+/**
+ * A client for the Ensembl REST service /map endpoint, to convert from
+ * coordinates of one genome assembly to another.
+ * <p>
+ * Note that species and assembly identifiers passed to this class must be valid
+ * in Ensembl. They are not case sensitive.
+ * 
+ * @author gmcarstairs
+ * @see https://rest.ensembl.org/documentation/info/assembly_map
+ * @see https://rest.ensembl.org/info/assembly/human?content-type=text/xml
+ * @see https://rest.ensembl.org/info/species?content-type=text/xml
+ */
 public class EnsemblMap extends EnsemblRestClient
 {
   private static final String MAPPED = "mapped";
@@ -98,18 +130,6 @@ public class EnsemblMap extends EnsemblRestClient
   }
 
   @Override
-  protected String getRequestMimeType(boolean multipleIds)
-  {
-    return "application/json";
-  }
-
-  @Override
-  protected String getResponseMimeType()
-  {
-    return "application/json";
-  }
-
-  @Override
   protected URL getUrl(List<String> ids) throws MalformedURLException
   {
     return null; // not used
@@ -131,30 +151,15 @@ public class EnsemblMap extends EnsemblRestClient
           String fromRef, String toRef, int[] queryRange)
   {
     URL url = null;
-    BufferedReader br = null;
-
     try
     {
       url = getAssemblyMapUrl(species, chromosome, fromRef, toRef, queryRange[0],
               queryRange[1]);
-      br = getHttpResponse(url, null);
-      return (parseAssemblyMappingResponse(br));
+      return (parseAssemblyMappingResponse(url));
     } catch (Throwable t)
     {
-      System.out.println("Error calling " + url + ": " + t.getMessage());
+      Cache.log.error("Error calling " + url + ": " + t.getMessage());
       return null;
-    } finally
-    {
-      if (br != null)
-      {
-        try
-        {
-          br.close();
-        } catch (IOException e)
-        {
-          // ignore
-        }
-      }
     }
   }
 
@@ -173,22 +178,23 @@ public class EnsemblMap extends EnsemblRestClient
    * @param br
    * @return
    */
-  protected int[] parseAssemblyMappingResponse(BufferedReader br)
+  @SuppressWarnings("unchecked")
+  protected int[] parseAssemblyMappingResponse(URL url)
   {
     int[] result = null;
-    JSONParser jp = new JSONParser();
 
     try
     {
-      JSONObject parsed = (JSONObject) jp.parse(br);
-      JSONArray mappings = (JSONArray) parsed.get(MAPPINGS);
-
-      Iterator rvals = mappings.iterator();
+      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1, MODE_ITERATOR, MAPPINGS);
+      if (rvals == null)
+      {
+        return null;
+      }
       while (rvals.hasNext())
       {
         // todo check for "mapped"
-        JSONObject val = (JSONObject) rvals.next();
-        JSONObject mapped = (JSONObject) val.get(MAPPED);
+        Map<String, Object> val = (Map<String, Object>) rvals.next();
+        Map<String, Object> mapped = (Map<String, Object>) val.get(MAPPED);
         int start = Integer.parseInt(mapped.get("start").toString());
         int end = Integer.parseInt(mapped.get("end").toString());
         String strand = mapped.get("strand").toString();
@@ -248,37 +254,19 @@ public class EnsemblMap extends EnsemblRestClient
           int end, String cdsOrCdna)
   {
     URL url = null;
-    BufferedReader br = null;
-
     try
     {
       String domain = new EnsemblInfo().getDomain(division);
       if (domain != null)
       {
         url = getIdMapUrl(domain, accession, start, end, cdsOrCdna);
-        br = getHttpResponse(url, null);
-        if (br != null)
-        {
-          return (parseIdMappingResponse(br, accession, domain));
-        }
+        return (parseIdMappingResponse(url, accession, domain));
       }
       return null;
     } catch (Throwable t)
     {
-      System.out.println("Error calling " + url + ": " + t.getMessage());
+      Cache.log.error("Error calling " + url + ": " + t.getMessage());
       return null;
-    } finally
-    {
-      if (br != null)
-      {
-        try
-        {
-          br.close();
-        } catch (IOException e)
-        {
-          // ignore
-        }
-      }
     }
   }
 
@@ -324,17 +312,18 @@ public class EnsemblMap extends EnsemblRestClient
    * @param domain
    * @return
    */
-  GeneLociI parseIdMappingResponse(BufferedReader br, String accession,
+  @SuppressWarnings("unchecked")
+GeneLociI parseIdMappingResponse(URL url, String accession,
           String domain)
   {
-    JSONParser jp = new JSONParser();
 
     try
     {
-      JSONObject parsed = (JSONObject) jp.parse(br);
-      JSONArray mappings = (JSONArray) parsed.get(MAPPINGS);
-
-      Iterator rvals = mappings.iterator();
+      Iterator<Object> rvals = (Iterator<Object>) getJSON(url, null, -1, MODE_ITERATOR, MAPPINGS);
+      if (rvals == null)
+      {
+        return null;
+      }
       String assembly = null;
       String chromosome = null;
       int fromEnd = 0;
@@ -342,11 +331,11 @@ public class EnsemblMap extends EnsemblRestClient
 
       while (rvals.hasNext())
       {
-        JSONObject val = (JSONObject) rvals.next();
-        JSONObject original = (JSONObject) val.get("original");
+        Map<String, Object> val = (Map<String, Object>) rvals.next();
+        Map<String, Object> original = (Map<String, Object>) val.get("original");
         fromEnd = Integer.parseInt(original.get("end").toString());
 
-        JSONObject mapped = (JSONObject) val.get(MAPPED);
+        Map<String, Object> mapped = (Map<String, Object>) val.get(MAPPED);
         int start = Integer.parseInt(mapped.get("start").toString());
         int end = Integer.parseInt(mapped.get("end").toString());
         String ass = mapped.get("assembly_name").toString();
@@ -386,34 +375,9 @@ public class EnsemblMap extends EnsemblRestClient
       final String chr = chromosome;
       List<int[]> fromRange = Collections.singletonList(new int[] { 1,
           fromEnd });
-      final MapList map = new MapList(fromRange, regions, 1, 1);
-      return new GeneLociI()
-      {
-
-        @Override
-        public String getSpeciesId()
-        {
-          return species == null ? "" : species;
-        }
-
-        @Override
-        public String getAssemblyId()
-        {
-          return as;
-        }
-
-        @Override
-        public String getChromosomeId()
-        {
-          return chr;
-        }
-
-        @Override
-        public MapList getMap()
-        {
-          return map;
-        }
-      };
+      Mapping mapping = new Mapping(new MapList(fromRange, regions, 1, 1));
+      return new GeneLocus(species == null ? "" : species, as, chr,
+              mapping);
     } catch (IOException | ParseException | NumberFormatException e)
     {
       // ignore