X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestClient.java;h=4899e3809fab5b331b4540f25c0c73dc2d480109;hb=73f4373f0ad3d76ca36a32201d3ed53c255180c5;hp=e3e235490c949f1824a350612aab76858d1dcb0c;hpb=f0a6a74187eda02037680aea3d4de4e7128f2cb0;p=jalview.git
diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java
index e3e2354..4899e38 100644
--- a/src/jalview/fts/core/FTSRestClient.java
+++ b/src/jalview/fts/core/FTSRestClient.java
@@ -1,8 +1,29 @@
+/*
+ * 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;
@@ -44,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;
@@ -142,21 +163,62 @@ public abstract class FTSRestClient implements FTSRestClientI
}
@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
@@ -217,7 +279,6 @@ public abstract class FTSRestClient implements FTSRestClientI
this.getGroup());
}
-
@Override
public boolean equals(Object otherObject)
{
@@ -302,32 +363,6 @@ public abstract class FTSRestClient implements FTSRestClientI
return result;
}
- /**
- * Takes a collection of FTSDataColumnI and converts its 'code' values into a
- * tab delimited string.
- *
- * @param dataColumnFields
- * the collection of FTSDataColumnI to process
- * @return the generated comma delimited string from the supplied
- * FTSDataColumnI collection
- */
- public String getDataColumnsFieldsAsTabDelimitedString(
- Collection dataColumnFields)
- {
- String result = "";
- if (dataColumnFields != null && !dataColumnFields.isEmpty())
- {
- StringBuilder returnedFields = new StringBuilder();
- for (FTSDataColumnI field : dataColumnFields)
- {
- returnedFields.append("\t").append(field.getName());
- }
- returnedFields.deleteCharAt(0);
- result = returnedFields.toString();
- }
- return result;
- }
-
@Override
public Collection getAllFTSDataColumns()
{
@@ -349,7 +384,7 @@ public abstract class FTSRestClient implements FTSRestClientI
}
@Override
- public Collection getAllDefaulDisplayedDataColumns()
+ public Collection getAllDefaultDisplayedFTSDataColumns()
{
if (defaulDisplayedDataColumns == null
|| defaulDisplayedDataColumns.isEmpty())
@@ -408,6 +443,42 @@ 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)
+ {
+ String message = "";
+ switch (code)
+ {
+ case 400:
+ message = MessageManager.getString("exception.bad_request");
+ break;
+
+ case 410:
+ message = MessageManager.formatMessage(
+ "exception.fts_rest_service_no_longer_available", service);
+ break;
+ case 403:
+ case 404:
+ message = MessageManager.getString("exception.resource_not_be_found");
+ break;
+ case 408:
+ case 409:
+ case 500:
+ case 501:
+ case 502:
+ case 504:
+ case 505:
+ message = MessageManager.formatMessage("exception.fts_server_error",
+ service);
+ break;
+ case 503:
+ message = MessageManager.getString("exception.service_not_available");
+ break;
+ default:
+ break;
+ }
+ return message;
+ }
+
protected String getResourceFile(String fileName)
{
String result = "";
@@ -425,6 +496,10 @@ public abstract class FTSRestClient implements FTSRestClientI
@Override
public int getDefaultResponsePageSize()
{
+ if (dataColumns == null || dataColumns.isEmpty())
+ {
+ parseDataColumnsConfigFile();
+ }
return defaultResponsePageSize;
}