From 62aba8c8b873d311173620633ef1ff3778ba3bfc Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 15 May 2019 20:19:58 +0200
Subject: [PATCH] unused method removed
---
.../annotation/services/MiriamConnector.java | 25 ------------
.../services/MiriamConnectorTest.java | 38 -------------------
2 files changed, 63 deletions(-)
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java b/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java
index 27fd1c5534..bad3a61317 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java
@@ -180,31 +180,6 @@ public final class MiriamConnector extends CachableInterface implements IExterna
return getUrlString(new MiriamData(type, type.getExampleIdentifier())) != null;
}
- /**
- * This is alternative version of {@link #getUrlString(MiriamData)} method that
- * is around 30% faster. But it refers to beta version of
- * <a href="https://www.ebi.ac.uk/miriamws/main/rest/">miriam Rest API</a>.
- *
- * @param md
- * miriam data for which access url will be returned
- * @return url to resource pointed by miriam data
- * @throws AnnotationException
- * thrown when there is a problem with accessing miriam REST API
- */
- protected String getUrlString2(MiriamData md) throws AnnotationException {
- try {
- String queryUri = md.getDataType().getUris().get(0) + ":" + md.getResource();
- String query = "https://www.ebi.ac.uk/miriamws/main/rest/resolve/" + queryUri;
- String page = getWebPageContent(query);
- Document document = XmlParser.getXmlDocumentFromString(page);
- Node uri = XmlParser.getNode("uri", document.getChildNodes());
- return XmlParser.getNodeValue(uri);
-
- } catch (Exception e) {
- throw new AnnotationException("Problem with accessing miriam REST API", e);
- }
- }
-
/**
* Returns uri to miriam resource.
*
diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java b/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
index ae54b628aa..278c11e7bf 100644
--- a/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
+++ b/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
@@ -170,20 +170,6 @@ public class MiriamConnectorTest extends AnnotationTestFunctions {
}
}
- @Test
- public void testGetUrl2() throws Exception {
- try {
- MiriamData md = TaxonomyBackend.HUMAN_TAXONOMY;
-
- String url = miriamConnector.getUrlString2(md);
- assertNotNull(url);
-
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- }
- }
-
@Test
public void testGetUrlForDoi() throws Exception {
try {
@@ -210,30 +196,6 @@ public class MiriamConnectorTest extends AnnotationTestFunctions {
}
}
- @Test
- public void testGetUrl2WithInvalidApiResponse() throws Exception {
- WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
- GeneralCacheInterface cache = miriamConnector.getCache();
- try {
- miriamConnector.setCache(null);
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), nullable(String.class)))
- .thenThrow(new IOException());
- miriamConnector.setWebPageDownloader(mockDownloader);
-
- miriamConnector.getUrlString2(TaxonomyBackend.HUMAN_TAXONOMY);
-
- } catch (AnnotationException e) {
- assertTrue(e.getMessage().contains("Problem with accessing miriam REST API"));
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- miriamConnector.setWebPageDownloader(downloader);
- miriamConnector.setCache(cache);
- }
- }
-
@Test
public void testRefreshCacheQueryNotAvailable() throws Exception {
WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
--
GitLab