From ecb3c49c02a90f877cf0658ba6a944f04be74431 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 23 Aug 2021 17:43:20 +0100 Subject: [PATCH] JAL-3829 removed unneeded attribute in FTS core --- src/jalview/fts/core/FTSRestResponse.java | 10 ---------- .../fts/service/threedbeacons/TDBeaconsFTSRestClient.java | 12 +++--------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/jalview/fts/core/FTSRestResponse.java b/src/jalview/fts/core/FTSRestResponse.java index 66db2a0..ae50233 100644 --- a/src/jalview/fts/core/FTSRestResponse.java +++ b/src/jalview/fts/core/FTSRestResponse.java @@ -42,8 +42,6 @@ public class FTSRestResponse { private int numberOfItemsFound; - private Long sequenceLength; - private String responseTime; private Collection searchSummary; @@ -77,14 +75,6 @@ public class FTSRestResponse { this.searchSummary = searchSummary; } - - public long getSequenceLength() { - return sequenceLength; - } - - public void setSequenceLength(Long seqLength) { - this.sequenceLength = seqLength; - } /** * Convenience method to obtain a Table model for a given summary List based diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java index 9c6f45a..b55d9b1 100644 --- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java +++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java @@ -153,12 +153,9 @@ public class TDBeaconsFTSRestClient extends FTSRestClient } Object uniprot_entry = jsonObj.get("uniprot_entry"); - Long seqLength = (Long) ((Map) jsonObj.get("uniprot_entry")).get("sequence_length"); - //System.out.println(uniprot_entry); - //System.out.println(jsonObj); - //System.out.println("seqLenght :" + seqLength); - - //Map tdbResponse = (Map) jsonObj.get("structures"); + // TODO: decide if anything from uniprot_entry needs to be reported via the FTSRestResponse object + // Arnaud added seqLength = (Long) ((Map) jsonObj.get("uniprot_entry")).get("sequence_length"); + List structures = (List) jsonObj.get("structures"); result = new ArrayList<>(); @@ -168,13 +165,10 @@ public class TDBeaconsFTSRestClient extends FTSRestClient Map structure = (Map) strucIter.next(); result.add(getFTSData(structure, tdbRestRequest)); numFound++; - //System.out.println(structure); } - //System.out.println("1 : " + structures.get(1)); searchResult.setNumberOfItemsFound(numFound); searchResult.setSearchSummary(result); - searchResult.setSequenceLength(seqLength); } catch (ParseException e) { -- 1.7.10.2