X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestClient.java;h=076e2124aeb263ef0c191954d65396015c4ab667;hb=5d9994e09150d0a3e6c49cef59a5a9c242b16290;hp=230cbdb407e930fa20f959968123f4e0c61b4e48;hpb=0eb1ceda5e6045a03ae7eb90d00816f0615659ef;p=jalview.git diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java index 230cbdb..076e212 100644 --- a/src/jalview/fts/core/FTSRestClient.java +++ b/src/jalview/fts/core/FTSRestClient.java @@ -1,3 +1,23 @@ +/* + * 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; @@ -45,9 +65,9 @@ public abstract class FTSRestClient implements FTSRestClientI public void parseDataColumnsConfigFile() { String fileName = getColumnDataConfigFileName(); - - InputStream in = getClass().getResourceAsStream(fileName); - + + InputStream in = getClass().getResourceAsStream(fileName); + try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) { String line; @@ -62,8 +82,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,8 +158,9 @@ 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 @@ -259,7 +280,6 @@ public abstract class FTSRestClient implements FTSRestClientI this.getGroup()); } - @Override public boolean equals(Object otherObject) { @@ -269,7 +289,6 @@ public abstract class FTSRestClient implements FTSRestClientI && this.getGroup().equals(that.getGroup()); } - }; dataColumns.add(dataCol); @@ -295,7 +314,8 @@ public abstract class FTSRestClient implements FTSRestClientI } try { - this.primaryKeyColumn = getDataColumnByNameOrCode(primaryKeyColumnCode); + this.primaryKeyColumn = getDataColumnByNameOrCode( + primaryKeyColumnCode); } catch (Exception e) { e.printStackTrace(); @@ -345,7 +365,6 @@ public abstract class FTSRestClient implements FTSRestClientI return result; } - @Override public Collection getAllFTSDataColumns() { @@ -404,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 @@ -432,10 +451,9 @@ public abstract class FTSRestClient implements FTSRestClientI switch (code) { case 400: - message = MessageManager - .getString("exception.bad_request"); + message = MessageManager.getString("exception.bad_request"); break; - + case 410: message = MessageManager.formatMessage( "exception.fts_rest_service_no_longer_available", service);