X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblRestClient.java;h=5960f81e718485e8df3aacbc130c48e0c66ec64e;hb=4324ab9c09ac74782aef9493b98280060bccd5e8;hp=5903f69a92536b20a5e6057d96cf0c6953b503fc;hpb=21be5363b2f7b61aade8a4b4caf54da28d8cd82a;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java index 5903f69..5960f81 100644 --- a/src/jalview/ext/ensembl/EnsemblRestClient.java +++ b/src/jalview/ext/ensembl/EnsemblRestClient.java @@ -20,6 +20,7 @@ */ package jalview.ext.ensembl; +import jalview.io.DataSourceType; import jalview.io.FileParse; import jalview.util.StringUtils; @@ -56,13 +57,13 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher /* * update these constants when Jalview has been checked / updated for - * changes to Ensembl REST API + * changes to Ensembl REST API (ref JAL-2105) * @see https://github.com/Ensembl/ensembl-rest/wiki/Change-log * @see http://rest.ensembl.org/info/rest?content-type=application/json */ - private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "4.6"; + private static final String LATEST_ENSEMBLGENOMES_REST_VERSION = "5.0"; - private static final String LATEST_ENSEMBL_REST_VERSION = "4.7"; + private static final String LATEST_ENSEMBL_REST_VERSION = "5.0"; private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log"; @@ -245,7 +246,7 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher // request failed return null; } - FileParse fp = new FileParse(reader, url.toString(), "HTTP_POST"); + FileParse fp = new FileParse(reader, url.toString(), DataSourceType.URL); return fp; } @@ -512,9 +513,11 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher boolean laterVersion = StringUtils.compareVersions(version, expected) == 1; if (laterVersion) { - System.err.println(String.format( - "Expected %s REST version %s but found %s, see %s", - getDbSource(), expected, version, REST_CHANGE_LOG)); + System.err + .println(String + .format("EnsemblRestClient expected %s REST version %s but found %s, see %s", + getDbSource(), expected, version, + REST_CHANGE_LOG)); } info.restVersion = version; } catch (Throwable t)