X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblRestClient.java;fp=src%2Fjalview%2Fext%2Fensembl%2FEnsemblRestClient.java;h=9dea886a2726461dfbb7c5d1628dbeb173667f1a;hb=948bd3bcbacc509da0cefaae3eedd97300a6ccce;hp=b19f557148d6303b46733f37eb6f9d076873dc72;hpb=a2703f9c2948fba9747b304fed02b7bbc5d32b37;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java
index b19f557..9dea886 100644
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -72,7 +72,10 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
 
   private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log";
 
-  private static Map<String, EnsemblInfo> domainData = new HashMap<>();
+  private static Map<String, EnsemblData> domainData;
+
+  // @see https://github.com/Ensembl/ensembl-rest/wiki/Output-formats
+  private static final String PING_URL = "http://rest.ensembl.org/info/ping.json";
 
   private final static long AVAILABILITY_RETEST_INTERVAL = 10000L; // 10 seconds
 
@@ -82,10 +85,10 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
 
   static
   {
+    domainData = new HashMap<>();
     domainData.put(DEFAULT_ENSEMBL_BASEURL,
-            new EnsemblInfo(DEFAULT_ENSEMBL_BASEURL, LATEST_ENSEMBL_REST_VERSION));
-    domainData.put(DEFAULT_ENSEMBL_GENOMES_BASEURL,
-            new EnsemblInfo(
+            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));
   }
 
@@ -104,11 +107,11 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
     if (!domainData.containsKey(ensemblDomain))
     {
       domainData.put(ensemblDomain,
-              new EnsemblInfo(ensemblDomain, LATEST_ENSEMBL_REST_VERSION));
+              new EnsemblData(ensemblDomain, LATEST_ENSEMBL_REST_VERSION));
     }
     if (!domainData.containsKey(ensemblGenomesDomain))
     {
-      domainData.put(ensemblGenomesDomain, new EnsemblInfo(
+      domainData.put(ensemblGenomesDomain, new EnsemblData(
               ensemblGenomesDomain, LATEST_ENSEMBLGENOMES_REST_VERSION));
     }
   }
@@ -393,7 +396,7 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
    */
   protected boolean isEnsemblAvailable()
   {
-    EnsemblInfo info = domainData.get(getDomain());
+    EnsemblData info = domainData.get(getDomain());
 
     long now = System.currentTimeMillis();
 
@@ -467,7 +470,7 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
    */
   private void checkEnsemblRestVersion()
   {
-    EnsemblInfo info = domainData.get(getDomain());
+    EnsemblData info = domainData.get(getDomain());
 
     JSONParser jp = new JSONParser();
     URL url = null;