X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestClient.java;h=7a8a695ed258f551d4f3837ca520b6a2f03d558d;hb=66993ec5b2bbc67ed10836d2288d938f6c368076;hp=2f24a010c5dc8945ecb52cd7256096518315bf93;hpb=5585b4b0ed1f5dd85887ed6b76352947ce1be133;p=jalview.git diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java index 2f24a01..7a8a695 100644 --- a/src/jalview/fts/core/FTSRestClient.java +++ b/src/jalview/fts/core/FTSRestClient.java @@ -1,10 +1,25 @@ +/* + * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.fts.core; -import jalview.fts.api.FTSDataColumnI; -import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI; -import jalview.fts.api.FTSRestClientI; -import jalview.util.MessageManager; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -13,6 +28,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Objects; +import jalview.fts.api.FTSDataColumnI; +import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI; +import jalview.fts.api.FTSRestClientI; + /** * Base class providing implementation for common methods defined in * FTSRestClientI @@ -23,13 +42,13 @@ import java.util.Objects; */ public abstract class FTSRestClient implements FTSRestClientI { - protected Collection dataColumns = new ArrayList(); + protected Collection dataColumns = new ArrayList<>(); - protected Collection dataColumnGroups = new ArrayList(); + protected Collection dataColumnGroups = new ArrayList<>(); - protected Collection searchableDataColumns = new ArrayList(); + protected Collection searchableDataColumns = new ArrayList<>(); - protected Collection defaulDisplayedDataColumns = new ArrayList(); + protected Collection defaulDisplayedDataColumns = new ArrayList<>(); protected FTSDataColumnI primaryKeyColumn; @@ -45,10 +64,10 @@ public abstract class FTSRestClient implements FTSRestClientI public void parseDataColumnsConfigFile() { String fileName = getColumnDataConfigFileName(); - - InputStream in = getClass().getResourceAsStream(fileName); - - try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) + + InputStream in = getClass().getResourceAsStream(fileName); + + try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) { String line; while ((line = br.readLine()) != null) @@ -62,8 +81,8 @@ public abstract class FTSRestClient implements FTSRestClientI { primaryKeyColumnCode = lineData[1]; } - if (lineData[0] - .equalsIgnoreCase("_data_column.default_response_page_size")) + if (lineData[0].equalsIgnoreCase( + "_data_column.default_response_page_size")) { defaultResponsePageSize = Integer.valueOf(lineData[1]); } @@ -138,26 +157,68 @@ public abstract class FTSRestClient implements FTSRestClientI @Override public String getAltCode() { - return lineData[1].split("\\|").length > 1 ? lineData[1] - .split("\\|")[1] : getCode(); + return lineData[1].split("\\|").length > 1 + ? lineData[1].split("\\|")[1] + : getCode(); } @Override - public Class getDataColumnClass() + public DataTypeI getDataType() { - String classString = lineData[2]; - classString = classString.toUpperCase(); - switch (classString) + final String[] dataTypeString = lineData[2].split("\\|"); + final String classString = dataTypeString[0].toUpperCase(); + + return new DataTypeI() { - case "INT": - case "INTEGER": - return Integer.class; - case "DOUBLE": - return Double.class; - case "STRING": - default: - return String.class; - } + + @Override + public boolean isFormtted() + { + if (dataTypeString.length > 1 + && dataTypeString[1] != null) + { + switch (dataTypeString[1].toUpperCase()) + { + case "T": + case "TRUE": + return true; + case "F": + case "False": + default: + return false; + } + } + return false; + } + + @Override + public int getSignificantFigures() + { + if (dataTypeString.length > 2 + && dataTypeString[2] != null) + { + return Integer.valueOf(dataTypeString[2]); + } + return 0; + } + + @Override + public Class getDataTypeClass() + { + switch (classString) + { + case "INT": + case "INTEGER": + return Integer.class; + case "DOUBLE": + return Double.class; + case "STRING": + default: + return String.class; + } + } + }; + } @Override @@ -218,12 +279,12 @@ public abstract class FTSRestClient implements FTSRestClientI this.getGroup()); } - @Override public boolean equals(Object otherObject) { FTSDataColumnI that = (FTSDataColumnI) otherObject; - return this.getCode().equals(that.getCode()) + return otherObject == null ? false + : this.getCode().equals(that.getCode()) && this.getName().equals(that.getName()) && this.getGroup().equals(that.getGroup()); } @@ -253,7 +314,8 @@ public abstract class FTSRestClient implements FTSRestClientI } try { - this.primaryKeyColumn = getDataColumnByNameOrCode(primaryKeyColumnCode); + this.primaryKeyColumn = getDataColumnByNameOrCode( + primaryKeyColumnCode); } catch (Exception e) { e.printStackTrace(); @@ -303,7 +365,6 @@ public abstract class FTSRestClient implements FTSRestClientI return result; } - @Override public Collection getAllFTSDataColumns() { @@ -325,7 +386,7 @@ public abstract class FTSRestClient implements FTSRestClientI } @Override - public Collection getAllDefaulDisplayedDataColumns() + public Collection getAllDefaultDisplayedFTSDataColumns() { if (defaulDisplayedDataColumns == null || defaulDisplayedDataColumns.isEmpty()) @@ -362,8 +423,8 @@ public abstract class FTSRestClient implements FTSRestClientI return column; } } - throw new Exception("Couldn't find data column with name : " - + nameOrCode); + throw new Exception( + "Couldn't find data column with name : " + nameOrCode); } @Override @@ -384,23 +445,21 @@ public abstract class FTSRestClient implements FTSRestClientI throw new Exception("Couldn't find data column group with id : " + id); } - public String getMessageByHTTPStatusCode(int code, String service) + public static String getMessageByHTTPStatusCode(int code, String service) { String message = ""; switch (code) { case 400: - message = MessageManager - .getString("exception.bad_request"); + message = "Bad request. There is a problem with your input."; break; - + case 410: - message = MessageManager.formatMessage( - "exception.fts_rest_service_no_longer_available", service); + message = service + " rest services no longer available!"; break; case 403: case 404: - message = MessageManager.getString("exception.resource_not_be_found"); + message = "The requested resource could not be found"; break; case 408: case 409: @@ -409,15 +468,16 @@ public abstract class FTSRestClient implements FTSRestClientI case 502: case 504: case 505: - message = MessageManager.getString("exception.fts_server_error"); + message = "There seems to be an error from the " + service + + " server"; break; case 503: - message = MessageManager.getString("exception.service_not_available"); + message = "Service not available. The server is being updated, try again later."; break; default: break; } - return message; + return String.valueOf(code) + " " + message; } protected String getResourceFile(String fileName)