*/
package jalview.ext.ensembl;
-import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.GeneLociI;
+import jalview.datamodel.GeneLocus;
+import jalview.datamodel.Mapping;
import jalview.util.MapList;
-import java.io.BufferedReader;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
/**
* @param br
* @return
*/
- protected String parseGeneId(JSONObject val)
+ protected String parseGeneId(Map<String, Object> val)
{
if (val == null)
{
public String getSpecies(String identifier)
{
String species = null;
- JSONObject json = getResult(identifier, null);
+ Map<String, Object> json = getResult(identifier, null);
if (json != null)
{
Object o = json.get(SPECIES);
}
/**
- * Calls the /lookup/id rest service and returns the response as a JSONObject,
- * or null if any error
+ * Calls the /lookup/id rest service and returns the response as a Map<String,
+ * Object>, or null if any error
*
* @param identifier
* @param objectType
* (optional)
* @return
*/
- protected JSONObject getResult(String identifier, String objectType)
+ @SuppressWarnings("unchecked")
+ protected Map<String, Object> getResult(String identifier,
+ String objectType)
{
List<String> ids = Arrays.asList(new String[] { identifier });
- BufferedReader br = null;
try
{
- URL url = getUrl(identifier, objectType);
-
- if (url != null)
- {
- br = getHttpResponse(url, ids);
- }
- return br == null ? null : (JSONObject) (new JSONParser().parse(br));
+ return (Map<String, Object>) getJSON(getUrl(identifier, objectType),
+ ids, -1, MODE_MAP, null);
} catch (IOException | ParseException e)
{
System.err.println("Error parsing " + identifier + " lookup response "
+ e.getMessage());
return null;
- } finally
- {
- if (br != null)
- {
- try
- {
- br.close();
- } catch (IOException e)
- {
- // ignore
- }
- }
}
}
* @param json
* @return
*/
- GeneLociI parseGeneLoci(JSONObject json)
+ GeneLociI parseGeneLoci(Map<String, Object> json)
{
if (json == null)
{
boolean reverseStrand = "-1".equals(strand);
int toStart = reverseStrand ? end : start;
int toEnd = reverseStrand ? start : end;
- List<int[]> fromRange = Collections.singletonList(new int[] { 1,
- fromEnd });
- List<int[]> toRange = Collections.singletonList(new int[] { toStart,
- toEnd });
- final MapList map = new MapList(fromRange, toRange, 1, 1);
- return new GeneLociI()
- {
-
- @Override
- public String getSpeciesId()
- {
- return species == null ? "" : species;
- }
-
- @Override
- public String getAssemblyId()
- {
- return assembly;
- }
-
- @Override
- public String getChromosomeId()
- {
- return chromosome;
- }
-
- @Override
- public MapList getMap()
- {
- return map;
- }
- };
+ List<int[]> fromRange = Collections
+ .singletonList(new int[]
+ { 1, fromEnd });
+ List<int[]> toRange = Collections
+ .singletonList(new int[]
+ { toStart, toEnd });
+ final Mapping map = new Mapping(
+ new MapList(fromRange, toRange, 1, 1));
+ return new GeneLocus(species == null ? "" : species, assembly,
+ chromosome, map);
} catch (NullPointerException | NumberFormatException e)
{
- Cache.log.error("Error looking up gene loci: " + e.getMessage());
+ Console.error("Error looking up gene loci: " + e.getMessage());
e.printStackTrace();
}
return null;