JAL-2253 safer simpler resolution of identifiers using lookup endpoint;

[jalview.git] / src / jalview / ext / ensembl / EnsemblSymbol.java

diff --git a/src/jalview/ext/ensembl/EnsemblSymbol.java b/src/jalview/ext/ensembl/EnsemblSymbol.java
index 9f86731..671bfec 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblSymbol.java
+++ b/src/jalview/ext/ensembl/EnsemblSymbol.java
@@ -74,7 +74,8 @@ public class EnsemblSymbol extends EnsemblXref
       {
         JSONObject val = (JSONObject) rvals.next();
         String id = val.get("id").toString();
-        if (id != null && isGeneIdentifier(id))
+        String type = val.get("type").toString();
+        if (id != null && "gene".equals(type))
         {
           result = id;
           break;
@@ -87,12 +88,31 @@ public class EnsemblSymbol extends EnsemblXref
     return result;
   }
 
-  protected URL getUrl(String id, Species species)
+  /**
+   * Constructs the URL for the REST symbol endpoint
+   * 
+   * @param id
+   *          the accession id (Ensembl or external)
+   * @param species
+   *          a species name recognisable by Ensembl
+   * @param type
+   *          an optional type to filter the response (gene, transcript,
+   *          translation)
+   * @return
+   */
+  protected URL getUrl(String id, Species species, String... type)
   {
-    String url = getDomain() + "/xrefs/symbol/" + species.toString() + "/"
-            + id + "?content-type=application/json";
+    StringBuilder sb = new StringBuilder();
+    sb.append(getDomain()).append("/xrefs/symbol/")
+            .append(species.toString()).append("/").append(id)
+            .append("?content-type=application/json");
+    for (String t : type)
+    {
+      sb.append("&object_type=").append(t);
+    }
     try
     {
+      String url = sb.toString();
       return new URL(url);
     } catch (MalformedURLException e)
     {
@@ -107,7 +127,7 @@ public class EnsemblSymbol extends EnsemblXref
    * @param identifier
    * @return
    */
-  public List<String> getIds(String identifier)
+  public List<String> getGeneIds(String identifier)
   {
     List<String> result = new ArrayList<String>();
     List<String> ids = new ArrayList<String>();
@@ -123,15 +143,18 @@ public class EnsemblSymbol extends EnsemblXref
         {
           if (taxon.isModelOrganism())
           {
-            URL url = getUrl(query, taxon);
+            URL url = getUrl(query, taxon, "gene");
             if (url != null)
             {
               br = getHttpResponse(url, ids);
-            }
-            String geneId = parseSymbolResponse(br);
-            if (geneId != null)
-            {
-              result.add(geneId);
+              if (br != null)
+              {
+                String geneId = parseSymbolResponse(br);
+                if (geneId != null && !result.contains(geneId))
+                {
+                  result.add(geneId);
+                }
+              }
             }
           }
         }