TDB.executeRequest fix & test passed

[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 e6d45e5..b6be709 100644 (file)
--- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
+++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
@@ -75,13 +75,13 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
         clientResponseClass = ClientResponse.class;
       }
       WebResource webResource;
-      webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN)
-              .queryParam("ac", query);
+      webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN).path(query);
+      URI uri = webResource.getURI();
+//              .queryParam("P", query);
 //              .queryParam("rows", String.valueOf(responseSize))
 //              .queryParam("P",query);
-      URI uri = webResource.getURI();
-        
-      System.out.println(uri);
+//      URI uri = webResource.getURI();
+      System.out.println(uri.toString());
         
       // Execute the REST request
       ClientResponse clientResponse = webResource
@@ -92,7 +92,7 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
       Map<String, Object> jsonObj = null;
       String responseString = null;
   
-      System.out.println("query >>>>>>> " + tdbRestRequest.toString());
+      //System.out.println("query >>>>>>> " + tdbRestRequest.toString());
         
       // Check the response status and report exception if one occurs
       int responseStatus = clientResponse.getStatus();
@@ -140,8 +140,8 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
       
   }
   
-  public String setSearchTerm() {
-    return null;
+  public String setSearchTerm(String term) {
+    return term;
   }
   
   public static FTSRestResponse parseTDBeaconsJsonResponse(
@@ -169,7 +169,7 @@ public class TDBeaconsFTSRestClient extends FTSRestClient
       //String seqLength = tdbEntry.get("sequence_length").toString();
       //int seqLength = Integer.valueOf(tdbEntry.get("sequence_length").toString());
       
-      int seqLength = (int) ((Map<String, Object>) jsonObj.get("uniprot_entry")).get("sequence_length");
+      Long seqLength = (Long) ((Map<String, Object>) jsonObj.get("uniprot_entry")).get("sequence_length");
       result = new ArrayList<>();
       List<Object> structures = (List<Object>) jsonObj.get("structures");
       int numFound = 0;
@@ -304,8 +304,7 @@ private static FTSData getFTSData(Map<String, Object> tdbJsonStructure,
   @Override
   public String getColumnDataConfigFileName()
   {
-    // TODO Auto-generated method stub
-    return null;
+    return "/fts/tdbeacons_data_columns.txt";
   }
   
   public static FTSRestClientI getInstance()