diff --git a/qanary-component-KG2KG-TranslateAnnotationsOfInstance/src/main/java/eu/wdaqua/qanary/component/KG2KGTranslateAnnotationsOfInstance.java b/qanary-component-KG2KG-TranslateAnnotationsOfInstance/src/main/java/eu/wdaqua/qanary/component/KG2KGTranslateAnnotationsOfInstance.java index c68457f03..6ea344ae9 100644 --- a/qanary-component-KG2KG-TranslateAnnotationsOfInstance/src/main/java/eu/wdaqua/qanary/component/KG2KGTranslateAnnotationsOfInstance.java +++ b/qanary-component-KG2KG-TranslateAnnotationsOfInstance/src/main/java/eu/wdaqua/qanary/component/KG2KGTranslateAnnotationsOfInstance.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.net.URISyntaxException; @Component public class KG2KGTranslateAnnotationsOfInstance extends QanaryComponent { @@ -89,7 +90,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { /** * Fetching all annotations of type qa:AnnotationsOfInstance */ - public ResultSet fetchAnnotations(String graphID, final QanaryUtils qanaryUtils) throws IOException, SparqlQueryFailed { + public ResultSet fetchAnnotations(String graphID, final QanaryUtils qanaryUtils) throws IOException, SparqlQueryFailed, URISyntaxException { String requestQuery = getRequestQuery(graphID); return qanaryUtils.getQanaryTripleStoreConnector().select(requestQuery); } diff --git a/qanary-component-LD-Shuyo/src/test/java/eu/wdaqua/qanary/component/shuyo/ld/LanguageDetectionTest.java b/qanary-component-LD-Shuyo/src/test/java/eu/wdaqua/qanary/component/shuyo/ld/LanguageDetectionTest.java index 1714cf97d..6b8b212ab 100644 --- a/qanary-component-LD-Shuyo/src/test/java/eu/wdaqua/qanary/component/shuyo/ld/LanguageDetectionTest.java +++ b/qanary-component-LD-Shuyo/src/test/java/eu/wdaqua/qanary/component/shuyo/ld/LanguageDetectionTest.java @@ -25,7 +25,7 @@ public class LanguageDetectionTest { private static final Logger logger = LoggerFactory.getLogger(LanguageDetectionTest.class); private static LanguageDetection myLanguageDetection; - private final short expectedQualityAsPercent = 85; + private final short expectedQualityAsPercent = 80; @BeforeAll public static void initLanguageDetection() throws IOException, LangDetectException { diff --git a/qanary-component-NED-Opentapioca/pom.xml b/qanary-component-NED-Opentapioca/pom.xml index ad6670730..f691e8e2b 100644 --- a/qanary-component-NED-Opentapioca/pom.xml +++ b/qanary-component-NED-Opentapioca/pom.xml @@ -5,20 +5,20 @@ 4.0.0 eu.wdaqua.qanary.component qanary-component-NED-Opentapioca - 3.3.3 + 3.3.4 eu.wdaqua.qanary qa.qanarycomponent-parent [0.1.0,1.0.0) + 17 [3.7.6,4.0.0) qanary qanary-component-ned-opentapioca 1.4.13 - 1.7.0 @@ -46,7 +46,6 @@ org.springdoc springdoc-openapi-data-rest - ${springdoc.version} diff --git a/qanary-component-QB-SimpleRealNameOfSuperHero/pom.xml b/qanary-component-QB-SimpleRealNameOfSuperHero/pom.xml index 1e4b2af0f..aecf096ea 100644 --- a/qanary-component-QB-SimpleRealNameOfSuperHero/pom.xml +++ b/qanary-component-QB-SimpleRealNameOfSuperHero/pom.xml @@ -5,81 +5,27 @@ 4.0.0 eu.wdaqua.qanary.component qanary-component-QB-SimpleRealNameOfSuperHero - 3.2.0 + 3.3.0 + - org.springframework.boot - spring-boot-starter-parent - 2.6.7 - + eu.wdaqua.qanary + qa.qanarycomponent-parent + [0.1.0,1.0.0) + 17 - [3.7.6,4.0.0) qanary qanary-component-qb-simplerealnameofsuperhero 1.4.13 - 1.7.0 - - eu.wdaqua.qanary - qa.component - ${qanary.version} - - - org.apache.logging.log4j - log4j-to-slf4j - - - - - eu.wdaqua.qanary - qa.commons - [3.5.4,4.0.0] - - - org.apache.logging.log4j - log4j-to-slf4j - [2.19.0,3.) - - - org.apache.logging.log4j - log4j-api - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.hamcrest - hamcrest-all - 1.3 - test - org.junit.jupiter junit-jupiter-engine test - - junit - junit - test - - - hamcrest-core - org.hamcrest - - - org.springframework spring-test @@ -108,12 +54,10 @@ org.springdoc springdoc-openapi-ui - ${spingdoc.version} org.springdoc springdoc-openapi-webmvc-core - ${spingdoc.version} diff --git a/qanary-component-QB-Sina/src/main/java/eu/wdaqua/qanary/component/sina/qb/SINA.java b/qanary-component-QB-Sina/src/main/java/eu/wdaqua/qanary/component/sina/qb/SINA.java index 1ba5c2c8d..b60268fc5 100644 --- a/qanary-component-QB-Sina/src/main/java/eu/wdaqua/qanary/component/sina/qb/SINA.java +++ b/qanary-component-QB-Sina/src/main/java/eu/wdaqua/qanary/component/sina/qb/SINA.java @@ -109,7 +109,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { return myQanaryMessage; } - private StringBuilder fetchEntities(final QanaryQuestion qanaryQuestion, final QanaryUtils qanaryUtils) throws SparqlQueryFailed, IOException { + private StringBuilder fetchEntities(final QanaryQuestion qanaryQuestion, final QanaryUtils qanaryUtils) throws SparqlQueryFailed, IOException, URISyntaxException { QuerySolutionMap bindingsForGetEntities = new QuerySolutionMap(); bindingsForGetEntities.add("graph", ResourceFactory.createResource(qanaryQuestion.getInGraph().toASCIIString())); diff --git a/qanary-component-QBE-SimpleQueryBuilderAndExecutor/src/main/java/eu/wdaqua/qanary/component/simplequerybuilderandexecutor/qbe/QueryBuilder.java b/qanary-component-QBE-SimpleQueryBuilderAndExecutor/src/main/java/eu/wdaqua/qanary/component/simplequerybuilderandexecutor/qbe/QueryBuilder.java index 0ad125475..021056786 100644 --- a/qanary-component-QBE-SimpleQueryBuilderAndExecutor/src/main/java/eu/wdaqua/qanary/component/simplequerybuilderandexecutor/qbe/QueryBuilder.java +++ b/qanary-component-QBE-SimpleQueryBuilderAndExecutor/src/main/java/eu/wdaqua/qanary/component/simplequerybuilderandexecutor/qbe/QueryBuilder.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import java.net.URISyntaxException; @Component /** @@ -280,7 +281,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { * @param myQanaryQuestion * @return */ - private List getClassesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException { + private List getClassesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException, URISyntaxException { List classes = new ArrayList(); QuerySolutionMap bindingsForSelect = new QuerySolutionMap(); @@ -308,7 +309,7 @@ private List getClassesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQue * @param myQanaryQuestion * @return */ - private List getPropertiesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException { + private List getPropertiesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException, URISyntaxException { List properties = new ArrayList(); QuerySolutionMap bindingsForSelect = new QuerySolutionMap(); @@ -335,7 +336,7 @@ private List getPropertiesFromQanaryKB(QanaryUtils myQanaryUtils, Qanary * @param myQanaryQuestion * @return */ - private List getEntitiesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException { + private List getEntitiesFromQanaryKB(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException, URISyntaxException { List entities = new ArrayList(); QuerySolutionMap bindingsForSelect = new QuerySolutionMap(); diff --git a/qanary-component-QE-SparqlExecuter/src/main/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuter.java b/qanary-component-QE-SparqlExecuter/src/main/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuter.java index b154fd7b5..2683d1e06 100644 --- a/qanary-component-QE-SparqlExecuter/src/main/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuter.java +++ b/qanary-component-QE-SparqlExecuter/src/main/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuter.java @@ -124,7 +124,7 @@ public String selectKnowledgeGraphEnpdoint(String sparqlQuery){ return endpoint; } - public String getResultSparqlQuery(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException{ + public String getResultSparqlQuery(QanaryUtils myQanaryUtils, QanaryQuestion myQanaryQuestion) throws SparqlQueryFailed, IOException, URISyntaxException{ ResultSet resultset = myQanaryUtils.getQanaryTripleStoreConnector().select(QanaryTripleStoreConnector.getLowestIndexAnnotationOfAnswerInGraph(myQanaryQuestion.getOutGraph())); String sparqlQuery = ""; while (resultset.hasNext()) { diff --git a/qanary-component-QE-SparqlExecuter/src/test/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuterTest.java b/qanary-component-QE-SparqlExecuter/src/test/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuterTest.java index e33d82cdb..a5f006e06 100644 --- a/qanary-component-QE-SparqlExecuter/src/test/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuterTest.java +++ b/qanary-component-QE-SparqlExecuter/src/test/java/eu/wdaqua/qanary/sparqlexecuter/SparqlExecuterTest.java @@ -84,7 +84,7 @@ void testGetSparqlInsertQuery() throws IOException, QanaryExceptionNoOrMultipleQ } @Test - void testGetResultSparqlQuery() throws SparqlQueryFailed, IOException { + void testGetResultSparqlQuery() throws SparqlQueryFailed, IOException, URISyntaxException { // This test exists only to ensure that SparqlExecuter.getResultSparqlQuery() // can handle the return type org.apache.jena.query.ResultSet. // diff --git a/qanary-component-RD-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/component/diambiguationproperty/rd/DiambiguationProperty.java b/qanary-component-RD-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/component/diambiguationproperty/rd/DiambiguationProperty.java index fbecaee65..7a7c25f14 100644 --- a/qanary-component-RD-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/component/diambiguationproperty/rd/DiambiguationProperty.java +++ b/qanary-component-RD-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/component/diambiguationproperty/rd/DiambiguationProperty.java @@ -25,6 +25,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; +import java.net.URISyntaxException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -130,7 +131,7 @@ public static String runCurlPOSTWithParam(String weburl, String data, String con * component */ @Override - public QanaryMessage process(QanaryMessage myQanaryMessage) throws SparqlQueryFailed, IOException { + public QanaryMessage process(QanaryMessage myQanaryMessage) throws SparqlQueryFailed, IOException, URISyntaxException { long startTime = System.currentTimeMillis(); //org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF); logger.info("process: {}", myQanaryMessage);