+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.fts.service.threedbeacons;
import java.net.URI;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import javax.ws.rs.core.MediaType;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSRestClientI;
import jalview.fts.api.StructureFTSRestClientI;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
import jalview.fts.core.FTSRestClient;
import jalview.fts.core.FTSRestRequest;
import jalview.fts.core.FTSRestResponse;
-import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
-import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.util.JSONUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
/**
* production server URI
*/
- private static String TDB_PROD_API="https://www.ebi.ac.uk/pdbe/pdbe-kb/3dbeacons/api/uniprot/summary/";
+ 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 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;
public static FTSRestClientI instance = null;
protected TDBeaconsFTSRestClient()
{
}
+
@SuppressWarnings("unchecked")
@Override
public FTSRestResponse executeRequest(FTSRestRequest tdbRestRequest)
}
WebResource webResource;
- webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN+query);
+ webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN + query);
URI uri = webResource.getURI();
System.out.println(uri.toString());
// Execute the REST request
ClientResponse clientResponse;
- if (isMocked()) {
+ if (isMocked())
+ {
clientResponse = null;
}
else
String responseString = null;
// Check the response status and report exception if one occurs
- int responseStatus = isMocked() ? (mockQueries.containsKey(query) ? 200 : 404) : clientResponse.getStatus();
+ int responseStatus = isMocked()
+ ? (mockQueries.containsKey(query) ? 200 : 404)
+ : clientResponse.getStatus();
switch (responseStatus)
{
// if success
}
else
{
- responseString = isMocked() ? mockQueries.get(query): clientResponse.getEntity(String.class);
+ responseString = isMocked() ? mockQueries.get(query)
+ : clientResponse.getEntity(String.class);
}
break;
case 400:
}
}
throw e;
-
+
}
}
/**
* returns response for when the 3D-Beacons service doesn't have a record for
- * the given query - in 2.11.2 this triggers a failover to the PDBe FTS
+ * the given query - in 2.11.2 this triggers a failover to the PDBe FTS
*
* @return null
*/
return searchResult;
}
- private static FTSData getFTSData(Map<String, Object> tdbJsonStructure,
+ private static FTSData getFTSData(
+ Map<String, Object> tdbJsonStructureSummary,
FTSRestRequest tdbRequest)
{
- // TODO: consider reusing PDBFTSRestClient.getFTSData ?
-
String primaryKey = null;
Object[] summaryRowData;
SequenceI associatedSeq = tdbRequest.getAssociatedSequence();
int colCounter = 0;
summaryRowData = new Object[(associatedSeq != null)
- ? displayFields.size() + 1
- : displayFields.size()];
- if (associatedSeq != null)
- {
- associatedSequence = associatedSeq;
- summaryRowData[0] = associatedSequence;
- colCounter = 1;
- }
-
+ ? displayFields.size() + 1
+ : displayFields.size()];
+ if (associatedSeq != null)
+ {
+ associatedSequence = associatedSeq;
+ summaryRowData[0] = associatedSequence;
+ colCounter = 1;
+ }
+ Map<String, Object> tdbJsonStructure = (Map<String, Object>) tdbJsonStructureSummary
+ .get("summary");
for (FTSDataColumnI field : displayFields)
{
String fieldData = (tdbJsonStructure.get(field.getCode()) == null)
final String primaryKey1 = primaryKey;
final Object[] summaryRowData1 = summaryRowData;
- return new FTSData()
- {
-
- @Override
- public Object[] getSummaryData()
- {
- return summaryRowData1;
- }
-
- @Override
- public Object getPrimaryKey()
- {
- return primaryKey1;
- }
-
- /**
- * Returns a string representation of this object;
- */
- @Override
- public String toString()
- {
- StringBuilder summaryFieldValues = new StringBuilder();
- for (Object summaryField : summaryRowData1)
- {
- summaryFieldValues.append(
- summaryField == null ? " " : summaryField.toString())
- .append("\t");
- }
- return summaryFieldValues.toString();
- }
-
- /**
- * Returns hash code value for this object
- */
- @Override
- public int hashCode()
- {
- return Objects.hash(primaryKey1, this.toString());
- }
-
- @Override
- public boolean equals(Object that)
- {
- return this.toString().equals(that.toString());
- }
- };
+ return new TDB_FTSData(primaryKey, tdbJsonStructure, summaryRowData1);
}
// private static FTSData getFTSData(Map<String, Object> doc,
private Collection<FTSDataColumnI> allDefaultDisplayedStructureDataColumns;
+ @Override
public Collection<FTSDataColumnI> getAllDefaultDisplayedStructureDataColumns()
{
if (allDefaultDisplayedStructureDataColumns == null
columnNames = new String[] { "", "Display", "Group" };
break;
case PREFERENCES:
- columnNames = new String[] { "3DB Beacons Field", "Show in search summary",
- "Show in structure summary" };
+ columnNames = new String[] { "3DB Beacons Field",
+ "Show in search summary", "Show in structure summary" };
break;
default:
break;
git://source.jalview.org / jalview.git / blobdiff