JAL-3193 removal of rest.ensemblgenomes.org

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

diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java
index 617ab21..8cfc343 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -64,8 +64,6 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
    * @see https://github.com/Ensembl/ensembl-rest/wiki/Change-log
    * @see http://rest.ensembl.org/info/rest?content-type=application/json
    */
-  private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "10.0";
-
   private static final String LATEST_ENSEMBL_REST_VERSION = "10.0";
 
   private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log";
@@ -83,8 +81,6 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
     domainData = new HashMap<>();
     domainData.put(DEFAULT_ENSEMBL_BASEURL,
             new EnsemblData(DEFAULT_ENSEMBL_BASEURL, LATEST_ENSEMBL_REST_VERSION));
-    domainData.put(DEFAULT_ENSEMBL_GENOMES_BASEURL, new EnsemblData(
-            DEFAULT_ENSEMBL_GENOMES_BASEURL, LATEST_ENSEMBLGENOMES_REST_VERSION));
   }
 
   protected volatile boolean inProgress = false;
@@ -99,28 +95,14 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
     /*
      * initialise domain info lazily
      */
-    if (!domainData.containsKey(ensemblDomain))
-    {
-      domainData.put(ensemblDomain,
-              new EnsemblData(ensemblDomain, LATEST_ENSEMBL_REST_VERSION));
-    }
-    if (!domainData.containsKey(ensemblGenomesDomain))
+    String domain = getDomain();
+    if (!domainData.containsKey(domain))
     {
-      domainData.put(ensemblGenomesDomain, new EnsemblData(
-              ensemblGenomesDomain, LATEST_ENSEMBLGENOMES_REST_VERSION));
+      domainData.put(domain,
+              new EnsemblData(domain, LATEST_ENSEMBL_REST_VERSION));
     }
   }
 
-  /**
-   * Constructor given the target domain to fetch data from
-   * 
-   * @param d
-   */
-  public EnsemblRestClient(String d)
-  {
-    setDomain(d);
-  }
-
   @Override
   public boolean queryInProgress()
   {
@@ -187,8 +169,6 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
     String pingUrl = getDomain() + "/info/ping" + CONTENT_TYPE_JSON;
     try
     {
-      // note this format works for both ensembl and ensemblgenomes
-      // info/ping.json works for ensembl only (March 2016)
       URL ping = new URL(pingUrl);
 
       /*