3253-omnibus save

[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 9a647f4..771980c 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -20,10 +20,6 @@
  */
 package jalview.ext.ensembl;
 
-import jalview.bin.Cache;
-import jalview.util.Platform;
-import jalview.util.StringUtils;
-
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -40,6 +36,9 @@ import javax.ws.rs.HttpMethod;
 
 import org.json.simple.parser.ParseException;
 
+import jalview.util.Platform;
+import jalview.util.StringUtils;
+
 /**
  * Base class for Ensembl REST service clients
  * 
@@ -50,8 +49,8 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
 
   static
   {
-    Cache.addJ2SDirectDatabaseCall("http://rest.ensembl");
-    Cache.addJ2SDirectDatabaseCall("https://rest.ensembl");
+    Platform.addJ2SDirectDatabaseCall("http://rest.ensembl");
+    Platform.addJ2SDirectDatabaseCall("https://rest.ensembl");
   }
 
   private static final int DEFAULT_READ_TIMEOUT = 5 * 60 * 1000; // 5 minutes
@@ -70,9 +69,9 @@ 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 = "9.0";
+  private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "10.0";
 
-  private static final String LATEST_ENSEMBL_REST_VERSION = "9.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";
 
@@ -320,10 +319,10 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
 
     InputStream response = connection.getInputStream();
 
-    Platform.timeCheck(null, Platform.TIME_MARK);
+    // Platform.timeCheck(null, Platform.TIME_MARK);
     Object ret = Platform.parseJSON(response);
-    Platform.timeCheck("EnsemblRestClient.getJSON " + url,
-            Platform.TIME_MARK);
+    // Platform.timeCheck("EnsemblRestClient.getJSON " + url,
+    // Platform.TIME_MARK);
 
     return ret;
   }