X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSequenceFetcher.java;fp=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSequenceFetcher.java;h=7454eb627cff9b5bbb76910c3083b1a7e753840a;hb=ca8504cf9d10874dce9f07cf7a9d933853fe0dd0;hp=4da0e3cff0a81e70666d91cf72814e4f6d1aa2e1;hpb=775e7bc104584e88dddcea73fbf02c66f5200c16;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
index 4da0e3c..7454eb6 100644
--- a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
+++ b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
@@ -42,7 +42,8 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
   // domain properties default values:
   protected static final String DEFAULT_ENSEMBL_BASEURL = "https://rest.ensembl.org";
 
-  protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = "https://rest.ensemblgenomes.org";
+  // ensemblgenomes REST service merged to ensembl 9th April 2019
+  protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = DEFAULT_ENSEMBL_BASEURL;
 
   /*
    * accepts ENSG/T/E/P with 11 digits
@@ -92,9 +93,9 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
      * this allows an easy change from http to https in future if needed
      */
     ensemblDomain = Cache.getDefault(ENSEMBL_BASEURL,
-            DEFAULT_ENSEMBL_BASEURL);
+            DEFAULT_ENSEMBL_BASEURL).trim();
     ensemblGenomesDomain = Cache.getDefault(ENSEMBL_GENOMES_BASEURL,
-            DEFAULT_ENSEMBL_GENOMES_BASEURL);
+            DEFAULT_ENSEMBL_GENOMES_BASEURL).trim();
     domain = ensemblDomain;
   }
 
@@ -102,10 +103,6 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
   public String getDbSource()
   {
     // NB ensure Uniprot xrefs are canonicalised from "Ensembl" to "ENSEMBL"
-    if (ensemblGenomesDomain.equals(getDomain()))
-    {
-      return DBRefSource.ENSEMBLGENOMES;
-    }
     return DBRefSource.ENSEMBL;
   }
 
@@ -169,6 +166,6 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
 
   protected void setDomain(String d)
   {
-    domain = d;
+    domain = d == null ? null : d.trim();
   }
 }