git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'improvement/JAL-4111_suffixed_DEVELOP_channels' into development/Releas...
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Uniprot.java
diff --git
a/src/jalview/ws/dbsources/Uniprot.java
b/src/jalview/ws/dbsources/Uniprot.java
index
2fc5893
..
3a6fed2
100644
(file)
--- a/
src/jalview/ws/dbsources/Uniprot.java
+++ b/
src/jalview/ws/dbsources/Uniprot.java
@@
-20,6
+20,7
@@
*/
package jalview.ws.dbsources;
*/
package jalview.ws.dbsources;
+import java.util.Locale;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
@@
-30,9
+31,9
@@
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.schemes.ResidueProperties;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.schemes.ResidueProperties;
+import jalview.util.Platform;
import jalview.util.StringUtils;
import jalview.ws.seqfetcher.DbSourceProxyImpl;
import jalview.util.StringUtils;
import jalview.ws.seqfetcher.DbSourceProxyImpl;
-import jalview.xml.binding.embl.ROOT;
import jalview.xml.binding.uniprot.DbReferenceType;
import jalview.xml.binding.uniprot.Entry;
import jalview.xml.binding.uniprot.FeatureType;
import jalview.xml.binding.uniprot.DbReferenceType;
import jalview.xml.binding.uniprot.Entry;
import jalview.xml.binding.uniprot.FeatureType;
@@
-41,8
+42,8
@@
import jalview.xml.binding.uniprot.PositionType;
import jalview.xml.binding.uniprot.PropertyType;
import java.io.InputStream;
import jalview.xml.binding.uniprot.PropertyType;
import java.io.InputStream;
+import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URL;
-import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@
-70,6
+71,7
@@
public class Uniprot extends DbSourceProxyImpl
private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
private static final String BAR_DELIMITER = "|";
private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
private static final String BAR_DELIMITER = "|";
+ private static Regex ACCESSION_REGEX;
/**
* Constructor
/**
* Constructor
@@
-103,7
+105,12
@@
public class Uniprot extends DbSourceProxyImpl
@Override
public Regex getAccessionValidator()
{
@Override
public Regex getAccessionValidator()
{
- return new Regex("([A-Z]+[0-9]+[A-Z0-9]+|[A-Z0-9]+_[A-Z0-9]+)");
+ if (ACCESSION_REGEX == null)
+ {
+ ACCESSION_REGEX = Platform
+ .newRegex("([A-Z]+[0-9]+[A-Z0-9]+|[A-Z0-9]+_[A-Z0-9]+)");
+ }
+ return ACCESSION_REGEX;
}
/*
}
/*
@@
-139,29
+146,35
@@
public class Uniprot extends DbSourceProxyImpl
startQuery();
try
{
startQuery();
try
{
- queries = queries.toUpperCase().replaceAll(
+ queries = queries.toUpperCase(Locale.ROOT).replaceAll(
"(UNIPROT\\|?|UNIPROT_|UNIREF\\d+_|UNIREF\\d+\\|?)", "");
AlignmentI al = null;
"(UNIPROT\\|?|UNIPROT_|UNIREF\\d+_|UNIREF\\d+\\|?)", "");
AlignmentI al = null;
- String downloadstring = getDomain() + "/uniprot/" + queries
- + ".xml";
+ String downloadstring = getDomain() + "/uniprot/" + queries + ".xml";
URL url = new URL(downloadstring);
URL url = new URL(downloadstring);
- URLConnection urlconn = url.openConnection();
- InputStream istr = urlconn.getInputStream();
- List<Entry> entries = getUniprotEntries(istr);
- if (entries != null)
+ HttpURLConnection urlconn = (HttpURLConnection) url.openConnection();
+ // anything other than 200 means we don't have data
+ // TODO: JAL-3882 reuse the EnsemblRestClient's fair
+ // use/backoff logic to retry when the server tells us to go away
+ if (urlconn.getResponseCode() == 200)
{
{
- List<SequenceI> seqs = new ArrayList<>();
- for (Entry entry : entries)
+ InputStream istr = urlconn.getInputStream();
+ List<Entry> entries = getUniprotEntries(istr);
+ if (entries != null)
{
{
- seqs.add(uniprotEntryToSequence(entry));
+ List<SequenceI> seqs = new ArrayList<>();
+ for (Entry entry : entries)
+ {
+ seqs.add(uniprotEntryToSequence(entry));
+ }
+ al = new Alignment(seqs.toArray(new SequenceI[seqs.size()]));
}
}
- al = new Alignment(seqs.toArray(new SequenceI[seqs.size()]));
}
stopQuery();
return al;
}
stopQuery();
return al;
+
} catch (Exception e)
{
throw (e);
} catch (Exception e)
{
throw (e);
@@
-186,8
+199,7
@@
public class Uniprot extends DbSourceProxyImpl
String seqString = entry.getSequence().getValue().replaceAll("\\s*",
"");
String seqString = entry.getSequence().getValue().replaceAll("\\s*",
"");
- SequenceI sequence = new Sequence(id,
- seqString);
+ SequenceI sequence = new Sequence(id, seqString);
sequence.setDescription(getUniprotEntryDescription(entry));
/*
sequence.setDescription(getUniprotEntryDescription(entry));
/*
@@
-195,12
+207,12
@@
public class Uniprot extends DbSourceProxyImpl
*/
final String dbVersion = getDbVersion();
List<DBRefEntry> dbRefs = new ArrayList<>();
*/
final String dbVersion = getDbVersion();
List<DBRefEntry> dbRefs = new ArrayList<>();
- boolean canonical=true;
+ boolean canonical = true;
for (String accessionId : entry.getAccession())
{
DBRefEntry dbRef = new DBRefEntry(DBRefSource.UNIPROT, dbVersion,
for (String accessionId : entry.getAccession())
{
DBRefEntry dbRef = new DBRefEntry(DBRefSource.UNIPROT, dbVersion,
- accessionId,null,canonical);
- canonical=false;
+ accessionId, null, canonical);
+ canonical = false;
dbRefs.add(dbRef);
}
dbRefs.add(dbRef);
}
@@
-242,8
+254,16
@@
public class Uniprot extends DbSourceProxyImpl
dbRefs.add(dbr);
}
}
dbRefs.add(dbr);
}
}
- if ("Ensembl".equals(type))
+ // from 2.11.2.6 - probably see a conflict here
+ if (type != null
+ && type.toLowerCase(Locale.ROOT).startsWith("ensembl"))
{
{
+ // remove version
+ String[] vrs = dbref.getId().split("\\.");
+ String version = vrs.length > 1 ? vrs[1]
+ : DBRefSource.UNIPROT + ":" + dbVersion;
+ dbr.setAccessionId(vrs[0]);
+ dbr.setVersion(version);
/*
* e.g. Uniprot accession Q9BXM7 has
* <dbReference type="Ensembl" id="ENST00000321556">
/*
* e.g. Uniprot accession Q9BXM7 has
* <dbReference type="Ensembl" id="ENST00000321556">
@@
-256,8
+276,12
@@
public class Uniprot extends DbSourceProxyImpl
"protein sequence ID");
if (cdsId != null && cdsId.trim().length() > 0)
{
"protein sequence ID");
if (cdsId != null && cdsId.trim().length() > 0)
{
+ // remove version
+ String[] cdsVrs = cdsId.split("\\.");
+ String cdsVersion = cdsVrs.length > 1 ? cdsVrs[1]
+ : DBRefSource.UNIPROT + ":" + dbVersion;
dbr = new DBRefEntry(DBRefSource.ENSEMBL,
dbr = new DBRefEntry(DBRefSource.ENSEMBL,
- DBRefSource.UNIPROT + ":" + dbVersion, cdsId.trim());
+ DBRefSource.UNIPROT + ":" + cdsVersion, cdsVrs[0]);
dbRefs.add(dbr);
}
}
dbRefs.add(dbr);
}
}
@@
-505,10
+529,12
@@
public class Uniprot extends DbSourceProxyImpl
XMLStreamReader streamReader = XMLInputFactory.newInstance()
.createXMLStreamReader(is);
javax.xml.bind.Unmarshaller um = jc.createUnmarshaller();
XMLStreamReader streamReader = XMLInputFactory.newInstance()
.createXMLStreamReader(is);
javax.xml.bind.Unmarshaller um = jc.createUnmarshaller();
- JAXBElement<jalview.xml.binding.uniprot.Uniprot> uniprotElement =
- um.unmarshal(streamReader, jalview.xml.binding.uniprot.Uniprot.class);
- jalview.xml.binding.uniprot.Uniprot uniprot = uniprotElement.getValue();
-
+ JAXBElement<jalview.xml.binding.uniprot.Uniprot> uniprotElement = um
+ .unmarshal(streamReader,
+ jalview.xml.binding.uniprot.Uniprot.class);
+ jalview.xml.binding.uniprot.Uniprot uniprot = uniprotElement
+ .getValue();
+
if (uniprot != null && !uniprot.getEntry().isEmpty())
{
entries = uniprot.getEntry();
if (uniprot != null && !uniprot.getEntry().isEmpty())
{
entries = uniprot.getEntry();
@@
-516,6
+542,14
@@
public class Uniprot extends DbSourceProxyImpl
} catch (JAXBException | XMLStreamException
| FactoryConfigurationError e)
{
} catch (JAXBException | XMLStreamException
| FactoryConfigurationError e)
{
+ if (e instanceof javax.xml.bind.UnmarshalException
+ && e.getCause() != null
+ && e.getCause() instanceof XMLStreamException
+ && e.getCause().getMessage().contains("[row,col]:[1,1]"))
+ {
+ // trying to parse an empty stream
+ return null;
+ }
e.printStackTrace();
}
return entries;
e.printStackTrace();
}
return entries;