git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3829 JAL-3865 test structure chooser queries to mocked 3D Beacons FTS
[jalview.git]
/
src
/
jalview
/
gui
/
structurechooser
/
ThreeDBStructureChooserQuerySource.java
diff --git
a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index
e188b23
..
0bf9fdb
100644
(file)
--- a/
src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/
src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@
-14,6
+14,7
@@
import jalview.datamodel.DBRefSource;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.fts.api.FTSDataColumnI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.fts.api.FTSDataColumnI;
+import jalview.fts.api.FTSRestClientI;
import jalview.fts.core.FTSDataColumnPreferences;
import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
import jalview.fts.core.FTSRestRequest;
import jalview.fts.core.FTSDataColumnPreferences;
import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
import jalview.fts.core.FTSRestRequest;
@@
-23,7
+24,7
@@
import jalview.jbgui.FilterOption;
import jalview.util.MessageManager;
/**
import jalview.util.MessageManager;
/**
- * logic for querying the PDBe API for structures of sequences
+ * logic for querying the 3DBeacons API for structures of sequences
*
* @author jprocter
*/
*
* @author jprocter
*/
@@
-33,9
+34,13
@@
public class ThreeDBStructureChooserQuerySource
private static int MAX_QLENGTH = 7820;
private static int MAX_QLENGTH = 7820;
+ protected FTSRestRequest lastTdbRequest;
+
+ protected FTSRestClientI tdbRestClient;
+
public ThreeDBStructureChooserQuerySource()
{
public ThreeDBStructureChooserQuerySource()
{
- pdbRestClient = TDBeaconsFTSRestClient.getInstance();
+ tdbRestClient = TDBeaconsFTSRestClient.getInstance();
docFieldPrefs = new FTSDataColumnPreferences(
PreferenceSource.STRUCTURE_CHOOSER,
TDBeaconsFTSRestClient.getInstance());
docFieldPrefs = new FTSDataColumnPreferences(
PreferenceSource.STRUCTURE_CHOOSER,
TDBeaconsFTSRestClient.getInstance());
@@
-143,10
+148,10
@@
public class ThreeDBStructureChooserQuerySource
FilterOption selectedFilterOpt, boolean b) throws Exception
{
FTSRestResponse resultList;
FilterOption selectedFilterOpt, boolean b) throws Exception
{
FTSRestResponse resultList;
- FTSRestRequest pdbRequest = getTDBeaconsRequest(seq, wantedFields);
- resultList = pdbRestClient.executeRequest(pdbRequest);
+ FTSRestRequest tdbRequest = getTDBeaconsRequest(seq, wantedFields);
+ resultList = tdbRestClient.executeRequest(tdbRequest);
- lastPdbRequest = pdbRequest;
+ lastTdbRequest = tdbRequest;
return resultList;
}
return resultList;
}
@@
-214,11
+219,11
@@
public class ThreeDBStructureChooserQuerySource
return null;
}
pdbRequest.setResponseSize(1);
return null;
}
pdbRequest.setResponseSize(1);
- resultList = pdbRestClient.executeRequest(pdbRequest);
+ resultList = tdbRestClient.executeRequest(pdbRequest);
// TODO: client side filtering - sort results and pick top one (or N)
// TODO: client side filtering - sort results and pick top one (or N)
- lastPdbRequest = pdbRequest;
+ lastTdbRequest = pdbRequest;
return resultList;
}
return resultList;
}
@@
-271,4
+276,11
@@
public class ThreeDBStructureChooserQuerySource
}
return pdbEntriesToView;
}
}
return pdbEntriesToView;
}
+
+
+ @Override
+ protected FTSRestRequest getLastFTSRequest()
+ {
+ return lastTdbRequest;
+ }
}
\ No newline at end of file
}
\ No newline at end of file