JAL-3829 JalviewJS workarounds/patches

[jalview.git] / src / jalview / fts / service / threedbeacons / TDBeaconsFTSRestClient.java

diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
index 9ca42e5..8263b22 100644 (file)
--- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
+++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
@@ -34,28 +34,21 @@ import jalview.util.Platform;
 public class TDBeaconsFTSRestClient extends FTSRestClient
         implements StructureFTSRestClientI
 {
-  private static final String DEFAULT_THREEDBEACONS_DOMAIN = "https://wwwdev.ebi.ac.uk/pdbe/pdbe-kb/3dbeacons/api/uniprot/summary/";
+  /**
+   * production server URI
+   */
+  private static String TDB_PROD_API="https://www.ebi.ac.uk/pdbe/pdbe-kb/3dbeacons/api/uniprot/summary/";
+  /**
+   * dev server URI
+   */
+  private static String TDB_DEV_API="https://wwwdev.ebi.ac.uk/pdbe/pdbe-kb/3dbeacons/api/uniprot/summary/";
+  private static String DEFAULT_THREEDBEACONS_DOMAIN = TDB_PROD_API; 
 
-  private static FTSRestClientI instance = null;
+  public static FTSRestClientI instance = null;
 
   protected TDBeaconsFTSRestClient()
   {
   }
-  public static void createMockTDBeaconsFSRestClient(String workingQuery, String jsonResponse) {
-    instance = new TDBeaconsFTSRestClient();
-    ((TDBeaconsFTSRestClient) instance).setMock(workingQuery,jsonResponse);
-  }
-  private String mockQuery = null;
-  
-  private String mockResponse = null;
-  protected void setMock(String workingQuery,String jsonResponse) {
-    mockQuery=workingQuery;
-    mockResponse = jsonResponse;
-  }
-  private boolean isMocked()
-  {
-    return mockQuery != null && mockResponse!=null;
-  }
   @SuppressWarnings("unchecked")
   @Override
   public FTSRestResponse executeRequest(FTSRestRequest tdbRestRequest)
@@ -82,9 +75,10 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
         client = Client.create(new DefaultClientConfig());
         clientResponseClass = ClientResponse.class;
       }
+
       WebResource webResource;
-      webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN)
-              .path(query);
+      webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN+query);
+
       URI uri = webResource.getURI();
       System.out.println(uri.toString());