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 c3cc69ec74e7d212604369adb67d743ed68b2409..de7d87feffc13156ec38b303a9acad4f24aa480a 100644 --- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java +++ b/annotation/src/main/java/lcsb/mapviewer/annotation/services/MiriamConnector.java @@ -181,12 +181,6 @@ public final class MiriamConnector extends CachableInterface implements IExterna * otherwise */ public boolean isValid(String uri) { - String query = VALID_URI_PREFIX + uri; - String val = getCacheValue(query); - if (val != null) { - return "true".equalsIgnoreCase(val); - } - boolean result = false; String name = getLink().getName(uri); if (name == null) { @@ -194,7 +188,6 @@ public final class MiriamConnector extends CachableInterface implements IExterna } else { result = !name.isEmpty(); } - setCacheValue(query, "" + result); return result; } 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 cdd52d3b5f6f72175c7594f793181778bf7682b4..03f636d2a4bbf5bc1205fb37c12b560de1d30ffc 100644 --- a/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java +++ b/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java @@ -6,9 +6,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import java.io.IOException; @@ -138,7 +138,8 @@ public class MiriamConnectorTest extends AnnotationTestFunctions { try { for (MiriamType mt : MiriamType.values()) { if (!MiriamType.UNKNOWN.equals(mt)) { - assertTrue("Invalid URI for MiriamType: " + mt, miriamConnector.isValid(mt.getUris().get(0))); + String uri = mt.getUris().get(0); + assertTrue("Invalid URI (" + uri + ") for MiriamType: " + mt, miriamConnector.isValid(mt.getUris().get(0))); } } @@ -231,7 +232,8 @@ public class MiriamConnectorTest extends AnnotationTestFunctions { try { miriamConnector.setCache(null); WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class); - when(mockDownloader.getFromNetwork(anyString(), anyString(), nullable(String.class))).thenThrow(new IOException()); + when(mockDownloader.getFromNetwork(anyString(), anyString(), nullable(String.class))) + .thenThrow(new IOException()); miriamConnector.setWebPageDownloader(mockDownloader); miriamConnector.getUrlString2(TaxonomyBackend.HUMAN_TAXONOMY); @@ -252,7 +254,8 @@ public class MiriamConnectorTest extends AnnotationTestFunctions { WebPageDownloader downloader = miriamConnector.getWebPageDownloader(); try { WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class); - when(mockDownloader.getFromNetwork(anyString(), anyString(), nullable(String.class))).thenThrow(new IOException()); + when(mockDownloader.getFromNetwork(anyString(), anyString(), nullable(String.class))) + .thenThrow(new IOException()); miriamConnector.setWebPageDownloader(mockDownloader); miriamConnector.refreshCacheQuery("http://google.pl/"); fail("Exception expected");