JAL-3253 jalview.bin.Instance streamlining

[jalview.git] / src / jalview / fts / service / uniprot / UniProtFTSRestClient.java

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 455ea98..871ba19 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -46,12 +46,6 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
 
 public class UniProtFTSRestClient extends FTSRestClient
 {
-  private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
-
-  static
-  {
-    Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
-  }
 
   public static FTSRestClientI getInstance()
   {
@@ -60,14 +54,22 @@ public class UniProtFTSRestClient extends FTSRestClient
             : j.uniprotFTSRestClient);
   }
 
-  public final String uniprotSearchEndpoint;
-
   private UniProtFTSRestClient()
   {
+    // singleton -- use getInstance()
+
     uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
             DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";    
   }
 
+  private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
+
+  public final String uniprotSearchEndpoint;
+
+  static
+  {
+    Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
+  }
   @SuppressWarnings("unchecked")
   @Override
   public FTSRestResponse executeRequest(FTSRestRequest uniprotRestRequest)